From f5f90a7a1517d5a8e973435a7ce945d0effb11bf Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 7 Dec 2020 22:55:24 -0800 Subject: [PATCH] Fix a bunch of warnings --- examples/em_reflection.rs | 2 +- examples/toroid25d.rs | 2 +- examples/wrapped_torus.rs | 4 +--- src/bin/viewer.rs | 4 ++-- src/driver.rs | 2 +- src/lib.rs | 12 ++++++------ src/sim.rs | 1 - src/stim.rs | 9 +++------ 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/examples/em_reflection.rs b/examples/em_reflection.rs index 7602b20..d0e1042 100644 --- a/examples/em_reflection.rs +++ b/examples/em_reflection.rs @@ -1,4 +1,4 @@ -use coremem::{GenericSim, Driver, mat}; +use coremem::{GenericSim, Driver}; use coremem::geom::Index; fn main() { diff --git a/examples/toroid25d.rs b/examples/toroid25d.rs index b7933de..824115d 100644 --- a/examples/toroid25d.rs +++ b/examples/toroid25d.rs @@ -1,5 +1,5 @@ use coremem::{Driver, Flt, mat, meas}; -use coremem::geom::{Coord, CylinderZ, Index, Meters, Vec2, Vec3}; +use coremem::geom::{CylinderZ, Index, Meters, Vec2, Vec3}; use coremem::stim::{Stimulus, Sinusoid}; use log::trace; diff --git a/examples/wrapped_torus.rs b/examples/wrapped_torus.rs index d5e303b..dea2d7e 100644 --- a/examples/wrapped_torus.rs +++ b/examples/wrapped_torus.rs @@ -1,7 +1,6 @@ use coremem::{Driver, Flt, mat, meas}; -use coremem::geom::{Coord, Index, Meters, Sphere, Torus, Vec2, Vec3}; +use coremem::geom::{Index, Meters, Torus, Vec3}; use coremem::stim::{CurlStimulus, Sinusoid}; -use log::trace; fn main() { coremem::init_logging(); @@ -20,7 +19,6 @@ fn main() { let from_m = |m| (m/feat_size) as u32; let m_to_um = |px| (px * 1e6) as u32; - // let to_m = |px| px as Flt * feat_size; let half_width = width * 0.5; let half_depth = depth * 0.5; diff --git a/src/bin/viewer.rs b/src/bin/viewer.rs index 4972cee..0b9bc33 100644 --- a/src/bin/viewer.rs +++ b/src/bin/viewer.rs @@ -1,8 +1,8 @@ -use coremem::{GenericSim as _, StaticSim}; +use coremem::StaticSim; use coremem::render::{ColorTermRenderer, Renderer as _, SerializedFrame}; use std::fs::{DirEntry, File, read_dir}; -use std::io::{BufReader, Read as _, stdin}; +use std::io::BufReader; use std::ops::Deref; use std::path::{Path, PathBuf}; use std::time::Duration; diff --git a/src/driver.rs b/src/driver.rs index 786a25a..f29c8dd 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -7,7 +7,7 @@ use crate::render::{self, MultiRenderer, Renderer}; use crate::sim::{GenericSim, SimState}; use crate::stim::AbstractStimulus; -use log::{info, debug, trace}; +use log::{info, trace}; use std::path::PathBuf; use std::sync::{Arc, Mutex}; use std::sync::mpsc::{sync_channel, SyncSender, Receiver}; diff --git a/src/lib.rs b/src/lib.rs index d49fd7b..a6f7e93 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -72,9 +72,9 @@ pub mod consts { pub(crate) fn C() -> Real { super::C.into() } - pub(crate) fn C2() -> Real { - C() * C() - } + // pub(crate) fn C2() -> Real { + // C() * C() + // } pub(crate) fn EPS0() -> Real { super::EPS0.into() } @@ -84,9 +84,9 @@ pub mod consts { pub(crate) fn ZERO() -> Real { 0.0.into() } - pub(crate) fn ONE() -> Real { - 1.0.into() - } + // pub(crate) fn ONE() -> Real { + // 1.0.into() + // } pub(crate) fn TWO() -> Real { 2.0.into() } diff --git a/src/sim.rs b/src/sim.rs index b64040a..d887ec6 100644 --- a/src/sim.rs +++ b/src/sim.rs @@ -6,7 +6,6 @@ use dyn_clone::{self, DynClone}; use log::trace; use ndarray::{Array3, Zip}; -use ndarray::parallel::prelude::*; use serde::{Serialize, Deserialize}; use std::convert::From; use std::iter::Sum; diff --git a/src/stim.rs b/src/stim.rs index a72b20d..d8a276d 100644 --- a/src/stim.rs +++ b/src/stim.rs @@ -1,9 +1,6 @@ use crate::consts; use crate::flt::Flt; -use crate::geom::{Coord as _, Index, Meters, Region, Vec3, Vec3u}; -use crate::sim::GenericSim; - -use log::debug; +use crate::geom::{Meters, Region, Vec3}; pub trait AbstractStimulus: Sync { /// Return the E field which should be added to the provided position/time. @@ -121,7 +118,7 @@ mod test { #[test] fn sinusoid() { - let mut s = Sinusoid::new((10.0, 1.0, -100.0).into(), 1000.0); + let s = Sinusoid::new((10.0, 1.0, -100.0).into(), 1000.0); assert_eq!(s.at(0.0), Vec3::zero()); assert_approx_eq!(s.at(0.00025), (10.0, 1.0, -100.0).into()); assert_approx_eq!(s.at(0.00050), Vec3::zero()); @@ -130,7 +127,7 @@ mod test { #[test] fn sinusoid_from_wavelength() { - let mut s = Sinusoid::from_wavelength((10.0, 1.0, -100.0).into(), 0.001); + let s = Sinusoid::from_wavelength((10.0, 1.0, -100.0).into(), 0.001); assert_eq!(s.at(0.0), Vec3::zero()); assert_approx_eq!(s.at(0.00025), (10.0, 1.0, -100.0).into()); assert_approx_eq!(s.at(0.00050), Vec3::zero());