From b52eefb1a3202d08bb34e21a571878e32854b0dc Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Thu, 19 Oct 2023 20:29:31 +0000 Subject: [PATCH] cleanup: Remove unused imports, formatting --- src/draw.rs | 4 ++-- src/guide.rs | 2 +- src/layout.rs | 3 +-- src/main.rs | 4 ++-- src/primitive.rs | 6 +++--- src/router.rs | 2 +- src/tracer.rs | 6 +++--- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/draw.rs b/src/draw.rs index af7cc9d..2eaa032 100644 --- a/src/draw.rs +++ b/src/draw.rs @@ -1,6 +1,6 @@ use contracts::{debug_ensures, debug_requires}; use enum_dispatch::enum_dispatch; -use geo::{EuclideanDistance, EuclideanLength, Point}; +use geo::{EuclideanLength, Point}; use crate::{ graph::{BendIndex, BendWeight, DotIndex, DotWeight, Ends, Index, SegIndex, SegWeight}, @@ -148,7 +148,7 @@ impl<'a> Draw<'a> { #[debug_ensures(ret.is_err() -> self.layout.node_count() == old(self.layout.node_count()))] pub fn segbend_around_bend( &mut self, - mut head: Head, + head: Head, around: BendIndex, width: f64, ) -> Result { diff --git a/src/guide.rs b/src/guide.rs index ddd0641..e39c1cd 100644 --- a/src/guide.rs +++ b/src/guide.rs @@ -1,7 +1,7 @@ use geo::Line; use crate::{ - draw::{Head, HeadTrait, SegbendHead}, + draw::{Head, HeadTrait}, graph::{BendIndex, DotIndex}, layout::Layout, math::{self, Circle}, diff --git a/src/layout.rs b/src/layout.rs index 35a714a..6a0f39c 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -1,11 +1,10 @@ -use contracts::{debug_ensures, debug_invariant}; +use contracts::debug_invariant; use geo::Point; use petgraph::stable_graph::StableDiGraph; use petgraph::visit::EdgeRef; use petgraph::Direction::Incoming; use rstar::primitives::GeomWithData; use rstar::{RTree, RTreeObject}; -use spade::Triangulation; use crate::band::Band; use crate::bow::Bow; diff --git a/src/main.rs b/src/main.rs index eda0a17..c05838a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,7 +39,7 @@ use sdl2::render::Canvas; use sdl2::video::Window; use sdl2::EventPump; use shape::Shape; -use std::panic; + use std::time::Duration; use tracer::{Trace, Tracer}; @@ -96,7 +96,7 @@ impl<'a> RouterObserver for DebugRouterObserver<'a> { ); } - fn on_probe(&mut self, tracer: &Tracer, trace: &Trace, edge: MeshEdgeReference) { + fn on_probe(&mut self, tracer: &Tracer, trace: &Trace, _edge: MeshEdgeReference) { render_times( self.event_pump, self.canvas, diff --git a/src/primitive.rs b/src/primitive.rs index def28f6..4d77b54 100644 --- a/src/primitive.rs +++ b/src/primitive.rs @@ -1,4 +1,4 @@ -use std::mem::{self, swap}; +use std::mem::swap; use enum_dispatch::enum_dispatch; use petgraph::stable_graph::{NodeIndex, StableDiGraph}; @@ -57,7 +57,7 @@ impl<'a, W> GenericPrimitive<'a, W> { }) .next() { - let weight = *self.graph.node_weight(index).unwrap(); + let _weight = *self.graph.node_weight(index).unwrap(); if let Some(Weight::Bend(..)) = self.graph.node_weight(index) { return Some(BendIndex::new(index)); @@ -103,7 +103,7 @@ impl<'a, W> GenericPrimitive<'a, W> { }) .next() { - let weight = *self.graph.node_weight(index).unwrap(); + let _weight = *self.graph.node_weight(index).unwrap(); if let Some(Weight::Bend(..)) = self.graph.node_weight(index) { return Some(BendIndex::new(index)); diff --git a/src/router.rs b/src/router.rs index d63e7b0..b3701e6 100644 --- a/src/router.rs +++ b/src/router.rs @@ -96,7 +96,7 @@ impl Router { let mut tracer = self.tracer(&mesh); let trace = tracer.start(mesh.vertex(from)); - let (_cost, path) = astar( + let (_cost, _path) = astar( &mesh, mesh.vertex(from), &mut RouterAstarStrategy::new(tracer, trace, mesh.vertex(to), observer), diff --git a/src/tracer.rs b/src/tracer.rs index ecc5004..29e4f2d 100644 --- a/src/tracer.rs +++ b/src/tracer.rs @@ -5,7 +5,7 @@ use crate::{ draw::{BareHead, Draw, Head, HeadTrait, SegbendHead}, graph::{BendIndex, DotIndex, Ends}, layout::Layout, - mesh::{Mesh, MeshEdgeReference, VertexIndex}, + mesh::{Mesh, VertexIndex}, primitive::MakeShape, rules::Rules, }; @@ -94,8 +94,8 @@ impl<'a> Tracer<'a> { } fn wrap(&mut self, head: Head, around: DotIndex, width: f64) -> Result { - let around_pos = self.layout.primitive(around).weight().circle.pos; - let around_primitive = self.layout.primitive(around); + let _around_pos = self.layout.primitive(around).weight().circle.pos; + let _around_primitive = self.layout.primitive(around); 'blk: { if let Some(mut layer) = self.layout.primitive(around).outer() {