From db50127cf58e9f839ffe3e8a1feb8150b121d5de Mon Sep 17 00:00:00 2001 From: numzero Date: Sat, 28 Sep 2024 12:59:00 +0300 Subject: [PATCH] Fix a few warnings --- Cargo.toml | 3 ++- src/bin/flat/main.rs | 4 ++-- src/fns.rs | 2 +- src/mesh_loader.rs | 4 ++-- src/riemann.rs | 2 +- src/tube/metric.rs | 16 ++++++++-------- src/tube/mod.rs | 12 ++++-------- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9eaee46..813c97a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,8 @@ name = "refraction" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lints.rust] +mixed_script_confusables = "allow" [profile.dev] panic = 'abort' diff --git a/src/bin/flat/main.rs b/src/bin/flat/main.rs index 06e4e2e..1b3a20d 100644 --- a/src/bin/flat/main.rs +++ b/src/bin/flat/main.rs @@ -215,8 +215,8 @@ fn draw_track(gc: &mut Vec, space: &Space, start: Vec2, dir: Vec2) { }; draw(&loc); for _ in 0..1000 { - let N = (STEP / DT).floor() as i32; - for _ in 0..N { + let n = (STEP / DT).floor() as i32; + for _ in 0..n { loc = space.move_step(loc, v * DT); } draw(&loc); diff --git a/src/fns.rs b/src/fns.rs index 92d884a..601db3f 100644 --- a/src/fns.rs +++ b/src/fns.rs @@ -120,7 +120,7 @@ impl QuadraticAccelerator { #[cfg(test)] mod test { - use approx::{abs_diff_eq, assert_abs_diff_eq, AbsDiffEq}; + use approx::{abs_diff_eq, assert_abs_diff_eq}; use super::*; diff --git a/src/mesh_loader.rs b/src/mesh_loader.rs index f9d5a8f..c212902 100644 --- a/src/mesh_loader.rs +++ b/src/mesh_loader.rs @@ -5,7 +5,7 @@ use std::io; struct ObjVertex { vertex: usize, normal: usize, - tex_coord: usize, + // tex_coord: usize, } #[derive(Copy, Clone, Debug)] @@ -42,7 +42,7 @@ impl ObjMesh { assert_eq!(tokens.len(), 3); ObjVertex { vertex: tokens[0], - tex_coord: tokens[1], + // tex_coord: tokens[1], normal: tokens[2], } } diff --git a/src/riemann.rs b/src/riemann.rs index d2b90a7..a1acf1a 100644 --- a/src/riemann.rs +++ b/src/riemann.rs @@ -145,7 +145,7 @@ mod tests { use super::*; use approx::assert_abs_diff_eq; - use glam::{mat3, vec3, Mat3}; + use glam::{vec3, Mat3}; use rand::{Rng, SeedableRng}; #[test] diff --git a/src/tube/metric.rs b/src/tube/metric.rs index 2b463d0..3ecb07a 100644 --- a/src/tube/metric.rs +++ b/src/tube/metric.rs @@ -142,8 +142,8 @@ mod test { for bx in [0.0, ε, 1.0, 7.0, 30.0 - ε] { let a = vec3(ax, -(space.tube.external_halflength + off), 0.); let b = vec3(bx, space.tube.external_halflength + off, 0.); - let Δ = vec3(bx - ax, 2.0 * (space.tube.internal_halflength + off), 0.); - let dir = Δ / (steps as f32); + let δ = vec3(bx - ax, 2.0 * (space.tube.internal_halflength + off), 0.); + let dir = δ / (steps as f32); let traced = space.trace_iter(Ray { pos: a, dir }).nth(steps).unwrap(); assert_abs_diff_eq!(traced.pos.x, b.x, epsilon = 1.0e-2); assert_abs_diff_eq!(traced.pos.y, b.y, epsilon = 1.0e1); @@ -180,8 +180,8 @@ mod test { ) { let a = vec3(ax, -(space.tube.external_halflength + off), 0.); let b = vec3(bx, space.tube.external_halflength + off, 0.); - let Δ = vec3(bx - ax, 2.0 * (space.tube.internal_halflength + off), 0.); - let dir = Δ / (steps as f32); + let δ = vec3(bx - ax, 2.0 * (space.tube.internal_halflength + off), 0.); + let dir = δ / (steps as f32); let traced = space.trace_iter(Ray { pos: a, dir }).nth(steps).unwrap(); assert_abs_diff_eq!(traced.pos.x, b.x, epsilon = 1.0e-2); assert_abs_diff_eq!(traced.pos.y, b.y, epsilon = 1.0e0); @@ -208,8 +208,8 @@ mod test { for x in [space.tube.inner_radius - ε, space.tube.inner_radius + ε] { let a = vec3(x, -(space.tube.external_halflength + off), 0.); let b = vec3(x, space.tube.external_halflength + off, 0.); - let Δ = vec3(0.0, 2.0 * (space.tube.internal_halflength + off), 0.); - let dir = Δ / (steps as f32); + let δ = vec3(0.0, 2.0 * (space.tube.internal_halflength + off), 0.); + let dir = δ / (steps as f32); let traced = space.trace_iter(Ray { pos: a, dir }).nth(steps).unwrap(); assert_abs_diff_eq!(traced.pos.x, b.x, epsilon = 1.0e-1); assert_abs_diff_eq!(traced.pos.y, b.y, epsilon = 1.0e0); @@ -235,8 +235,8 @@ mod test { for x in [space.tube.outer_radius + ε, space.tube.outer_radius - ε] { let a = vec3(x, -(space.tube.external_halflength + off), 0.); let b = vec3(x, space.tube.external_halflength + off, 0.); - let Δ = vec3(0.0, 2.0 * (space.tube.external_halflength + off), 0.); - let dir = Δ / (steps as f32); + let δ = vec3(0.0, 2.0 * (space.tube.external_halflength + off), 0.); + let dir = δ / (steps as f32); let traced = space.trace_iter(Ray { pos: a, dir }).nth(steps).unwrap(); assert_abs_diff_eq!(traced.pos.x, b.x, epsilon = 2.0e0); assert_abs_diff_eq!(traced.pos.y, b.y, epsilon = 1.0e0); diff --git a/src/tube/mod.rs b/src/tube/mod.rs index 9f7b434..524a422 100644 --- a/src/tube/mod.rs +++ b/src/tube/mod.rs @@ -1,4 +1,4 @@ -use glam::{bool, f32, vec3, Mat3, Vec3}; +use glam::{bool, f32, Mat3, Vec3}; use crate::ifaces::{DebugTraceable, RayPath, Traceable}; use coords::{FlatCoordinateSystem, InnerCS, OuterCS}; @@ -91,13 +91,6 @@ impl Space { } } - fn trace_boundary(&self, ray: Ray) -> Ray { - assert_eq!(self.which_subspace(ray.pos), Boundary); - self.trace_iter(ray) - .find(|&ray| self.which_subspace(ray.pos) != Boundary) - .expect("Can't get outta the wall!") - } - fn list_objects(&self, tfm: impl Fn(Location) -> Location) -> Vec { self.objs .iter() @@ -284,6 +277,9 @@ impl Rect { } } +#[cfg(test)] +use glam::vec3; + #[test] fn test_rect() { assert_eq!(