router: move top-level files to own `router` module

src/drawing/collect.rs

@@ -1,10 +1,9 @@
-use crate::wraparoundable::{GetWraparound, WraparoundableIndex};
+use crate::drawing::{
-
-use super::{
     bend::LooseBendIndex,
     graph::PrimitiveIndex,
     primitive::{GetInnerOuter, GetJoints},
     rules::RulesTrait,
+    wraparoundable::{GetWraparound, WraparoundableIndex},
     Drawing,
 };
 

src/drawing/drawing.rs

@@ -16,6 +16,7 @@ use crate::drawing::graph::GetMaybeNet;
 use crate::drawing::guide::Guide;
 use crate::drawing::primitive::GetLimbs;
 use crate::drawing::rules::GetConditions;
+use crate::drawing::wraparoundable::{GetWraparound, Wraparoundable, WraparoundableIndex};
 use crate::drawing::{
     bend::{FixedBendIndex, LooseBendIndex, LooseBendWeight},
     dot::{DotIndex, FixedDotIndex, FixedDotWeight, LooseDotIndex, LooseDotWeight},
@@ -38,7 +39,6 @@ use crate::geometry::{
 use crate::graph::{GenericIndex, GetNodeIndex};
 use crate::layout::zone::{ZoneIndex, ZoneWeight};
 use crate::math::NoTangents;
-use crate::wraparoundable::{GetWraparound, Wraparoundable, WraparoundableIndex};
 
 use super::bend::BendWeight;
 use super::seg::SegWeight;

src/drawing/mod.rs

@@ -10,5 +10,6 @@ pub mod primitive;
 pub mod rules;
 pub mod seg;
 pub mod segbend;
+pub mod wraparoundable;
 
 pub use drawing::*;

src/layout/layout.rs

@@ -13,6 +13,7 @@ use crate::{
             SeqLooseSegWeight,
         },
         segbend::Segbend,
+        wraparoundable::WraparoundableIndex,
         Drawing, Infringement, LayoutException,
     },
     geometry::{
@@ -26,7 +27,6 @@ use crate::{
         },
         zone::{PourZoneIndex, SolidZoneIndex, ZoneIndex, ZoneWeight},
     },
-    wraparoundable::WraparoundableIndex,
 };
 
 pub struct Layout<R: RulesTrait> {

src/lib.rs

@@ -1,7 +1,5 @@
 #![feature(try_blocks)]
 
-pub mod astar;
-pub mod draw;
 pub mod graph;
 #[macro_use]
 pub mod drawing;
@@ -9,8 +7,4 @@ pub mod dsn;
 pub mod geometry;
 pub mod layout;
 pub mod math;
-pub mod mesh;
 pub mod router;
-pub mod tracer;
-pub mod triangulation;
-pub mod wraparoundable;

src/router/draw.rs

@@ -11,11 +11,11 @@ use crate::{
         primitive::GetOtherJoint,
         rules::RulesTrait,
         seg::{LoneLooseSegWeight, SeqLooseSegWeight},
+        wraparoundable::WraparoundableIndex,
         Infringement, LayoutException,
     },
     layout::Layout,
     math::{Circle, NoTangents},
-    wraparoundable::WraparoundableIndex,
 };
 
 #[derive(Error, Debug, Clone, Copy)]

src/router/mesh.rs

@@ -8,7 +8,6 @@ use petgraph::{stable_graph::NodeIndex, visit::EdgeRef};
 use spade::{HasPosition, InsertionError, Point2};
 
 use crate::drawing::rules::RulesTrait;
-use crate::triangulation::TriangulationEdgeReference;
 use crate::{
     drawing::{
         bend::{FixedBendIndex, LooseBendIndex},
@@ -19,7 +18,7 @@ use crate::{
     },
     geometry::primitive::PrimitiveShapeTrait,
     graph::GetNodeIndex,
-    triangulation::{GetVertexIndex, Triangulation},
+    router::triangulation::{GetVertexIndex, Triangulation, TriangulationEdgeReference},
 };
 
 #[enum_dispatch(GetNodeIndex, MakePrimitive)]

src/router/mod.rs

@@ -0,0 +1,8 @@
+pub mod astar;
+pub mod draw;
+pub mod mesh;
+mod router;
+pub mod tracer;
+pub mod triangulation;
+
+pub use router::*;

src/router/router.rs

@@ -4,8 +4,6 @@ use petgraph::visit::EdgeRef;
 use spade::InsertionError;
 use thiserror::Error;
 
-use crate::astar::{astar, AstarStrategy, PathTracker};
-use crate::draw::DrawException;
 use crate::drawing::{
     dot::FixedDotIndex,
     graph::{MakePrimitive, PrimitiveIndex},
@@ -16,9 +14,12 @@ use crate::geometry::primitive::PrimitiveShapeTrait;
 use crate::layout::connectivity::BandIndex;
 use crate::layout::Layout;
 
-use crate::mesh::{Mesh, MeshEdgeReference, VertexIndex};
+use crate::router::{
-
+    astar::{astar, AstarStrategy, PathTracker},
-use crate::tracer::{Trace, Tracer};
+    draw::DrawException,
+    mesh::{Mesh, MeshEdgeReference, VertexIndex},
+    tracer::{Trace, Tracer},
+};
 
 #[derive(Error, Debug, Clone, Copy)]
 #[error("failed to route from {from:?} to {to:?}")] // this should eventually use Display

src/router/tracer.rs

@@ -1,16 +1,17 @@
 use contracts::debug_ensures;
 
 use crate::{
-    draw::{Draw, DrawException},
     drawing::{
         bend::LooseBendIndex,
         dot::FixedDotIndex,
-        graph::{GetMaybeNet, MakePrimitive},
+        guide::{BareHead, Head, SegbendHead},
-        guide::{BareHead, Head, HeadTrait, SegbendHead},
         rules::RulesTrait,
     },
     layout::{connectivity::BandIndex, Layout},
-    mesh::{Mesh, VertexIndex},
+    router::{
+        draw::{Draw, DrawException},
+        mesh::{Mesh, VertexIndex},
+    },
 };
 
 #[derive(Debug)]