From ace5709e5d279ad788a3b9d4e3fd5f078eed38c4 Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Mon, 15 Jul 2024 13:14:17 +0200 Subject: [PATCH] cleanup: `cargo fix`, `cargo fmt` to reduce number of error messages --- INSTALL.md | 2 +- src/board/board.rs | 1 - src/layout/layout.rs | 5 +---- src/router/draw.rs | 2 +- src/router/navmesh.rs | 2 +- src/router/route.rs | 31 ++++--------------------------- src/router/router.rs | 2 +- src/router/tracer.rs | 11 ++--------- src/specctra/design.rs | 2 +- tests/multilayer.rs | 2 +- 10 files changed, 13 insertions(+), 47 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7a6d64b..efab22f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -24,7 +24,7 @@ Change your working directory to your clone of Topola's repository: ### Command-line application -Run the following to build and install Topola's command-line +Run the following command to build and install Topola's command-line application: cargo install --locked --path . --features cli diff --git a/src/board/board.rs b/src/board/board.rs index d9f6936..1158eb4 100644 --- a/src/board/board.rs +++ b/src/board/board.rs @@ -15,7 +15,6 @@ use crate::{ Layout, NodeIndex, }, math::Circle, - router::{navmesh::Navmesh, route::Route, Router, RouterError}, }; #[derive(Debug)] diff --git a/src/layout/layout.rs b/src/layout/layout.rs index fe0b87b..94cd28b 100644 --- a/src/layout/layout.rs +++ b/src/layout/layout.rs @@ -19,10 +19,7 @@ use crate::{ wraparoundable::WraparoundableIndex, Drawing, Infringement, LayoutException, }, - geometry::{ - compound::ManageCompounds, primitive::AccessPrimitiveShape, shape::MeasureLength, - GenericNode, - }, + geometry::{compound::ManageCompounds, shape::MeasureLength, GenericNode}, graph::{GenericIndex, GetPetgraphIndex}, layout::{ poly::{Poly, PolyWeight}, diff --git a/src/router/draw.rs b/src/router/draw.rs index 72317bc..a428b34 100644 --- a/src/router/draw.rs +++ b/src/router/draw.rs @@ -1,5 +1,5 @@ use contracts::debug_ensures; -use geo::{EuclideanLength, Point}; +use geo::Point; use thiserror::Error; use crate::{ diff --git a/src/router/navmesh.rs b/src/router/navmesh.rs index ae79b9a..e1d5d87 100644 --- a/src/router/navmesh.rs +++ b/src/router/navmesh.rs @@ -7,7 +7,7 @@ use petgraph::{ graph::UnGraph, stable_graph::NodeIndex, visit::{ - self, Data, EdgeRef, GraphBase, IntoEdgeReferences, IntoEdges, IntoNeighbors, + Data, EdgeRef, GraphBase, IntoEdgeReferences, IntoEdges, IntoNeighbors, IntoNodeIdentifiers, NodeIndexable, }, }; diff --git a/src/router/route.rs b/src/router/route.rs index 7fb1de1..ccf8754 100644 --- a/src/router/route.rs +++ b/src/router/route.rs @@ -1,32 +1,9 @@ -use geo::EuclideanDistance; -use petgraph::{ - data::DataMap, - graph::{EdgeReference, NodeIndex, UnGraph}, - visit::EdgeRef, -}; -use thiserror::Error; - use crate::{ - drawing::{ - band::BandFirstSegIndex, - dot::{DotIndex, FixedDotIndex}, - graph::{MakePrimitive, PrimitiveIndex}, - primitive::MakePrimitiveShape, - rules::AccessRules, - }, - geometry::{ - primitive::{AccessPrimitiveShape, PrimitiveShape}, - shape::AccessShape, - }, - graph::GetPetgraphIndex, - layout::Layout, + drawing::{dot::FixedDotIndex, graph::PrimitiveIndex, rules::AccessRules}, + geometry::primitive::PrimitiveShape, router::{ - astar::{astar, Astar, AstarError, AstarStatus, AstarStrategy, PathTracker}, - draw::DrawException, - navmesh::{ - BinavvertexNodeIndex, Navmesh, NavmeshEdgeReference, NavmeshError, NavvertexIndex, - NavvertexWeight, - }, + astar::{Astar, AstarStatus}, + navmesh::Navmesh, trace::Trace, tracer::Tracer, Router, RouterAstarStrategy, RouterError, RouterStatus, diff --git a/src/router/router.rs b/src/router/router.rs index 0c737b4..d567214 100644 --- a/src/router/router.rs +++ b/src/router/router.rs @@ -7,7 +7,7 @@ use crate::{ band::BandFirstSegIndex, dot::{DotIndex, FixedDotIndex}, graph::{MakePrimitive, PrimitiveIndex}, - head::{GetFace, Head}, + head::GetFace, primitive::MakePrimitiveShape, rules::AccessRules, Collision, Infringement, LayoutException, diff --git a/src/router/tracer.rs b/src/router/tracer.rs index de4ad28..7ff9c7d 100644 --- a/src/router/tracer.rs +++ b/src/router/tracer.rs @@ -1,19 +1,12 @@ use contracts::{debug_ensures, debug_requires}; -use petgraph::{ - data::DataMap, - graph::{NodeIndex, UnGraph}, -}; use thiserror::Error; use crate::{ - drawing::{ - band::BandFirstSegIndex, bend::LooseBendIndex, dot::FixedDotIndex, graph::PrimitiveIndex, - rules::AccessRules, - }, + drawing::{band::BandFirstSegIndex, dot::FixedDotIndex, rules::AccessRules}, layout::Layout, router::{ draw::{Draw, DrawException}, - navmesh::{BinavvertexNodeIndex, Navmesh, NavvertexIndex, NavvertexWeight}, + navmesh::{Navmesh, NavvertexIndex}, trace::Trace, }, }; diff --git a/src/specctra/design.rs b/src/specctra/design.rs index b347a6c..c7fe02b 100644 --- a/src/specctra/design.rs +++ b/src/specctra/design.rs @@ -19,7 +19,7 @@ use crate::{ mesadata::SpecctraMesadata, read::{self, ListTokenizer}, structure::{self, DsnFile, Layer, Pcb, Shape}, - write::{self, ListWriter}, + write::ListWriter, }, }; diff --git a/tests/multilayer.rs b/tests/multilayer.rs index 87509c2..d10e71b 100644 --- a/tests/multilayer.rs +++ b/tests/multilayer.rs @@ -35,7 +35,7 @@ fn test_unrouted_lm317_breakout() { #[test] fn test_signal_integrity_test() { - let mut invoker = common::load_design_and_assert( + let invoker = common::load_design_and_assert( "tests/multilayer/data/signal_integrity_test/signal_integrity_test.dsn", );