cleanup: `cargo fix`, `cargo fmt` to reduce number of error messages

This commit is contained in:
Mikolaj Wielgus 2024-07-15 13:14:17 +02:00
parent 44d9d3dd83
commit ace5709e5d
10 changed files with 13 additions and 47 deletions

View File

@ -24,7 +24,7 @@ Change your working directory to your clone of Topola's repository:
### Command-line application ### 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: application:
cargo install --locked --path . --features cli cargo install --locked --path . --features cli

View File

@ -15,7 +15,6 @@ use crate::{
Layout, NodeIndex, Layout, NodeIndex,
}, },
math::Circle, math::Circle,
router::{navmesh::Navmesh, route::Route, Router, RouterError},
}; };
#[derive(Debug)] #[derive(Debug)]

View File

@ -19,10 +19,7 @@ use crate::{
wraparoundable::WraparoundableIndex, wraparoundable::WraparoundableIndex,
Drawing, Infringement, LayoutException, Drawing, Infringement, LayoutException,
}, },
geometry::{ geometry::{compound::ManageCompounds, shape::MeasureLength, GenericNode},
compound::ManageCompounds, primitive::AccessPrimitiveShape, shape::MeasureLength,
GenericNode,
},
graph::{GenericIndex, GetPetgraphIndex}, graph::{GenericIndex, GetPetgraphIndex},
layout::{ layout::{
poly::{Poly, PolyWeight}, poly::{Poly, PolyWeight},

View File

@ -1,5 +1,5 @@
use contracts::debug_ensures; use contracts::debug_ensures;
use geo::{EuclideanLength, Point}; use geo::Point;
use thiserror::Error; use thiserror::Error;
use crate::{ use crate::{

View File

@ -7,7 +7,7 @@ use petgraph::{
graph::UnGraph, graph::UnGraph,
stable_graph::NodeIndex, stable_graph::NodeIndex,
visit::{ visit::{
self, Data, EdgeRef, GraphBase, IntoEdgeReferences, IntoEdges, IntoNeighbors, Data, EdgeRef, GraphBase, IntoEdgeReferences, IntoEdges, IntoNeighbors,
IntoNodeIdentifiers, NodeIndexable, IntoNodeIdentifiers, NodeIndexable,
}, },
}; };

View File

@ -1,32 +1,9 @@
use geo::EuclideanDistance;
use petgraph::{
data::DataMap,
graph::{EdgeReference, NodeIndex, UnGraph},
visit::EdgeRef,
};
use thiserror::Error;
use crate::{ use crate::{
drawing::{ drawing::{dot::FixedDotIndex, graph::PrimitiveIndex, rules::AccessRules},
band::BandFirstSegIndex, geometry::primitive::PrimitiveShape,
dot::{DotIndex, FixedDotIndex},
graph::{MakePrimitive, PrimitiveIndex},
primitive::MakePrimitiveShape,
rules::AccessRules,
},
geometry::{
primitive::{AccessPrimitiveShape, PrimitiveShape},
shape::AccessShape,
},
graph::GetPetgraphIndex,
layout::Layout,
router::{ router::{
astar::{astar, Astar, AstarError, AstarStatus, AstarStrategy, PathTracker}, astar::{Astar, AstarStatus},
draw::DrawException, navmesh::Navmesh,
navmesh::{
BinavvertexNodeIndex, Navmesh, NavmeshEdgeReference, NavmeshError, NavvertexIndex,
NavvertexWeight,
},
trace::Trace, trace::Trace,
tracer::Tracer, tracer::Tracer,
Router, RouterAstarStrategy, RouterError, RouterStatus, Router, RouterAstarStrategy, RouterError, RouterStatus,

View File

@ -7,7 +7,7 @@ use crate::{
band::BandFirstSegIndex, band::BandFirstSegIndex,
dot::{DotIndex, FixedDotIndex}, dot::{DotIndex, FixedDotIndex},
graph::{MakePrimitive, PrimitiveIndex}, graph::{MakePrimitive, PrimitiveIndex},
head::{GetFace, Head}, head::GetFace,
primitive::MakePrimitiveShape, primitive::MakePrimitiveShape,
rules::AccessRules, rules::AccessRules,
Collision, Infringement, LayoutException, Collision, Infringement, LayoutException,

View File

@ -1,19 +1,12 @@
use contracts::{debug_ensures, debug_requires}; use contracts::{debug_ensures, debug_requires};
use petgraph::{
data::DataMap,
graph::{NodeIndex, UnGraph},
};
use thiserror::Error; use thiserror::Error;
use crate::{ use crate::{
drawing::{ drawing::{band::BandFirstSegIndex, dot::FixedDotIndex, rules::AccessRules},
band::BandFirstSegIndex, bend::LooseBendIndex, dot::FixedDotIndex, graph::PrimitiveIndex,
rules::AccessRules,
},
layout::Layout, layout::Layout,
router::{ router::{
draw::{Draw, DrawException}, draw::{Draw, DrawException},
navmesh::{BinavvertexNodeIndex, Navmesh, NavvertexIndex, NavvertexWeight}, navmesh::{Navmesh, NavvertexIndex},
trace::Trace, trace::Trace,
}, },
}; };

View File

@ -19,7 +19,7 @@ use crate::{
mesadata::SpecctraMesadata, mesadata::SpecctraMesadata,
read::{self, ListTokenizer}, read::{self, ListTokenizer},
structure::{self, DsnFile, Layer, Pcb, Shape}, structure::{self, DsnFile, Layer, Pcb, Shape},
write::{self, ListWriter}, write::ListWriter,
}, },
}; };

View File

@ -35,7 +35,7 @@ fn test_unrouted_lm317_breakout() {
#[test] #[test]
fn test_signal_integrity_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", "tests/multilayer/data/signal_integrity_test/signal_integrity_test.dsn",
); );