mirror of https://codeberg.org/topola/topola.git
Run `cargo fix`
This hasn't cleaned up all the unused import, but it's a good start.
This commit is contained in:
parent
ceef3a7fb7
commit
f2346eedb8
|
|
@ -70,7 +70,7 @@ impl<'a, 'b> Guide<'a, 'b> {
|
|||
}
|
||||
|
||||
fn head_circle(&self, head: &Head, width: f64) -> Circle {
|
||||
let conditions = Conditions {
|
||||
let _conditions = Conditions {
|
||||
lower_net: None,
|
||||
higher_net: None,
|
||||
layer: None,
|
||||
|
|
@ -92,7 +92,7 @@ impl<'a, 'b> Guide<'a, 'b> {
|
|||
}
|
||||
}
|
||||
|
||||
fn bend_circle(&self, bend: BendIndex, width: f64) -> Circle {
|
||||
fn bend_circle(&self, bend: BendIndex, _width: f64) -> Circle {
|
||||
let mut circle = self
|
||||
.layout
|
||||
.primitive(bend)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
use geo::Point;
|
||||
use petgraph::stable_graph::{EdgeIndex, NodeIndex, StableDiGraph};
|
||||
use petgraph::stable_graph::{StableDiGraph};
|
||||
use petgraph::visit::EdgeRef;
|
||||
use petgraph::Direction::Incoming;
|
||||
use rstar::primitives::GeomWithData;
|
||||
use rstar::RTree;
|
||||
use spade::{DelaunayTriangulation, HasPosition, Point2, Triangulation};
|
||||
use spade::{Triangulation};
|
||||
|
||||
use crate::bow::Bow;
|
||||
use crate::graph::{
|
||||
|
|
|
|||
28
src/main.rs
28
src/main.rs
|
|
@ -21,8 +21,8 @@ mod rules;
|
|||
mod segbend;
|
||||
mod shape;
|
||||
|
||||
use geo::EuclideanDistance;
|
||||
use graph::{SegWeight, Tag, TaggedIndex};
|
||||
|
||||
use graph::{Tag, TaggedIndex};
|
||||
use sdl2::event::Event;
|
||||
use sdl2::gfx::primitives::DrawRenderer;
|
||||
use sdl2::keyboard::Keycode;
|
||||
|
|
@ -55,7 +55,7 @@ fn main() {
|
|||
canvas.present();
|
||||
|
||||
let mut event_pump = sdl_context.event_pump().unwrap();
|
||||
let mut i = 0;
|
||||
let _i = 0;
|
||||
let mut router = Router::new();
|
||||
|
||||
let dot1_1 = router
|
||||
|
|
@ -68,7 +68,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let dot2_1 = router
|
||||
let _dot2_1 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 2,
|
||||
|
|
@ -78,7 +78,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let dot3_1 = router
|
||||
let _dot3_1 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 3,
|
||||
|
|
@ -88,7 +88,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let dot4_1 = router
|
||||
let _dot4_1 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 4,
|
||||
|
|
@ -109,7 +109,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let dot2_2 = router
|
||||
let _dot2_2 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 2,
|
||||
|
|
@ -119,7 +119,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let dot3_2 = router
|
||||
let _dot3_2 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 3,
|
||||
|
|
@ -129,7 +129,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let dot4_2 = router
|
||||
let _dot4_2 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 4,
|
||||
|
|
@ -140,7 +140,7 @@ fn main() {
|
|||
})
|
||||
.unwrap();
|
||||
|
||||
let dot5 = router
|
||||
let _dot5 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 5,
|
||||
|
|
@ -151,7 +151,7 @@ fn main() {
|
|||
})
|
||||
.unwrap();
|
||||
|
||||
let dot6 = router
|
||||
let _dot6 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 6,
|
||||
|
|
@ -162,7 +162,7 @@ fn main() {
|
|||
})
|
||||
.unwrap();
|
||||
|
||||
let dot7 = router
|
||||
let _dot7 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 5,
|
||||
|
|
@ -184,7 +184,7 @@ fn main() {
|
|||
})
|
||||
.unwrap();
|
||||
|
||||
let barrier2_dot1 = router
|
||||
let _barrier2_dot1 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 20,
|
||||
|
|
@ -194,7 +194,7 @@ fn main() {
|
|||
},
|
||||
})
|
||||
.unwrap();
|
||||
let barrier2_dot2 = router
|
||||
let _barrier2_dot2 = router
|
||||
.layout
|
||||
.add_dot(DotWeight {
|
||||
net: 20,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
use fixedbitset::FixedBitSet;
|
||||
use geo::{point, Point};
|
||||
use petgraph::{
|
||||
stable_graph::NodeIndex,
|
||||
visit::{self, NodeIndexable},
|
||||
};
|
||||
use spade::{
|
||||
|
|
@ -10,7 +9,7 @@ use spade::{
|
|||
DelaunayTriangulation, HasPosition, InsertionError, Point2, Triangulation,
|
||||
};
|
||||
|
||||
use crate::{graph::DotIndex, layout::Layout, router::Router};
|
||||
use crate::{graph::DotIndex, layout::Layout};
|
||||
|
||||
struct Vertex {
|
||||
pub dot: DotIndex,
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ use petgraph::stable_graph::{NodeIndex, StableDiGraph};
|
|||
use petgraph::Direction::{Incoming, Outgoing};
|
||||
|
||||
use crate::graph::{
|
||||
BendIndex, BendWeight, DotIndex, DotWeight, Ends, Index, Interior, Label, SegIndex, SegWeight,
|
||||
Tag, TaggedIndex, TaggedWeight,
|
||||
BendIndex, BendWeight, DotIndex, DotWeight, Ends, Index, Interior, Label, SegWeight, TaggedIndex, TaggedWeight,
|
||||
};
|
||||
use crate::math::{self, Circle};
|
||||
use crate::shape::{BendShape, DotShape, SegShape, Shape};
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
use geo::geometry::Point;
|
||||
use petgraph::visit::{EdgeRef, IntoEdgeReferences};
|
||||
use spade::InsertionError;
|
||||
use std::cell::{Ref, RefCell};
|
||||
use std::rc::Rc;
|
||||
|
||||
|
||||
|
||||
use crate::astar::astar;
|
||||
use crate::bow::Bow;
|
||||
use crate::graph::{BendIndex, DotIndex, Ends, Interior, SegIndex, TaggedIndex};
|
||||
use crate::graph::{BendWeight, DotWeight, SegWeight, TaggedWeight};
|
||||
use crate::graph::{BendIndex, DotIndex, Ends, SegIndex, TaggedIndex};
|
||||
use crate::graph::{BendWeight, DotWeight, SegWeight};
|
||||
use crate::guide::Guide;
|
||||
use crate::layout::Layout;
|
||||
use crate::math;
|
||||
|
||||
use crate::math::Circle;
|
||||
use crate::mesh::{Mesh, VertexIndex};
|
||||
use crate::rules::{Conditions, Rules};
|
||||
use crate::segbend::Segbend;
|
||||
use crate::shape::Shape;
|
||||
|
||||
|
||||
pub struct Router {
|
||||
pub layout: Layout,
|
||||
|
|
@ -48,11 +48,11 @@ impl Router {
|
|||
// right.
|
||||
self.mesh.triangulate(&self.layout)?;
|
||||
|
||||
let (cost, mesh_path) = astar(
|
||||
let (_cost, mesh_path) = astar(
|
||||
&self.mesh,
|
||||
self.mesh.vertex(from),
|
||||
|node, tracker| (node != self.mesh.vertex(to)).then_some(0),
|
||||
|edge| 1,
|
||||
|node, _tracker| (node != self.mesh.vertex(to)).then_some(0),
|
||||
|_edge| 1,
|
||||
|_| 0,
|
||||
)
|
||||
.unwrap(); // TODO.
|
||||
|
|
@ -142,7 +142,7 @@ impl Router {
|
|||
.head_around_bend_segment(&head, into_bend, to_cw, width);
|
||||
|
||||
let head = self.extend_head(head, tangent.start_point())?;
|
||||
let to_head = self.extend_head(to_head, tangent.end_point())?;
|
||||
let _to_head = self.extend_head(to_head, tangent.end_point())?;
|
||||
|
||||
let net = self.layout.primitive(head.dot).weight().net;
|
||||
self.layout
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use enum_as_inner::EnumAsInner;
|
|||
use geo::{point, polygon, EuclideanDistance, Intersects, Point, Polygon, Rotate};
|
||||
use rstar::{RTreeObject, AABB};
|
||||
|
||||
use crate::graph::{DotWeight, TaggedWeight};
|
||||
|
||||
use crate::math::{self, Circle};
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||
|
|
|
|||
Loading…
Reference in New Issue