refactor: don't export modules only containing a single item

crates/topola-egui/src/appearance_panel.rs

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use topola::board::{mesadata::AccessMesadata, Board};
+use topola::board::{AccessMesadata, Board};
 
 pub struct AppearancePanel {
     // TODO:

crates/topola-egui/src/overlay.rs

@@ -11,7 +11,7 @@ use topola::{
         ratsnest::Ratsnest,
         selection::{BboxSelectionKind, Selection},
     },
-    board::{mesadata::AccessMesadata, Board},
+    board::{AccessMesadata, Board},
     drawing::{
         graph::{GetLayer, MakePrimitive},
         primitive::MakePrimitiveShape,

crates/topola-egui/src/viewport.rs

@@ -13,7 +13,7 @@ use topola::{
         execution::Command,
         invoker::{GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles, Invoker},
     },
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::{
         graph::{MakePrimitive, PrimitiveIndex},
         primitive::MakePrimitiveShape,

src/autorouter/autoroute.rs

@@ -10,11 +10,11 @@ use std::ops::ControlFlow;
 use petgraph::graph::EdgeIndex;
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
-    drawing::{band::BandTermsegIndex, collect::Collect, graph::PrimitiveIndex},
+    drawing::{band::BandTermsegIndex, graph::PrimitiveIndex, Collect},
     geometry::primitive::PrimitiveShape,
     layout::LayoutEdit,
-    router::{navcord::NavcordStepper, navmesh::Navmesh, route::RouteStepper, Router},
+    router::{navcord::NavcordStepper, navmesh::Navmesh, RouteStepper, Router},
     stepper::Step,
 };
 

src/autorouter/autorouter.rs

@@ -10,7 +10,7 @@ use spade::InsertionError;
 use thiserror::Error;
 
 use crate::{
-    board::{mesadata::AccessMesadata, Board},
+    board::{AccessMesadata, Board},
     drawing::{band::BandTermsegIndex, dot::FixedDotIndex, Infringement},
     layout::{via::ViaWeight, LayoutEdit},
     router::{astar::AstarError, navmesh::NavmeshError, RouterOptions},

src/autorouter/compare_detours.rs

@@ -10,7 +10,7 @@ use std::ops::ControlFlow;
 use petgraph::graph::EdgeIndex;
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::{primitive::PrimitiveShape, shape::MeasureLength},
     graph::MakeRef,

src/autorouter/execution.rs

@@ -8,7 +8,7 @@ use enum_dispatch::enum_dispatch;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     layout::{via::ViaWeight, LayoutEdit},
     stepper::Step,
 };

src/autorouter/invoker.rs

@@ -12,7 +12,7 @@ use enum_dispatch::enum_dispatch;
 use thiserror::Error;
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::{edit::ApplyGeometryEdit, primitive::PrimitiveShape},
     router::{navcord::NavcordStepper, navmesh::Navmesh},

src/autorouter/measure_length.rs

@@ -7,7 +7,7 @@
 //! the length of specified band selections.
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::{primitive::PrimitiveShape, shape::MeasureLength as MeasureLengthTrait},
     graph::MakeRef,

src/autorouter/place_via.rs

@@ -7,7 +7,7 @@
 //! checks if the via has already been placed.
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::primitive::PrimitiveShape,
     layout::{via::ViaWeight, LayoutEdit},

src/autorouter/pointroute.rs

@@ -7,14 +7,14 @@ use std::ops::ControlFlow;
 use geo::Point;
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::{
         band::BandTermsegIndex,
         dot::{FixedDotIndex, FixedDotWeight},
     },
     layout::LayoutEdit,
     math::Circle,
-    router::{route::RouteStepper, Router},
+    router::{RouteStepper, Router},
     stepper::Step,
 };
 

src/autorouter/remove_bands.rs

@@ -5,7 +5,7 @@
 //! Provides functionality to remove bands from the layout.
 
 use crate::{
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::primitive::PrimitiveShape,
     layout::LayoutEdit,

src/autorouter/selection.rs

@@ -8,10 +8,10 @@ use rstar::AABB;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    board::{mesadata::AccessMesadata, BandName, Board, ResolvedSelector},
+    board::{AccessMesadata, BandName, Board, ResolvedSelector},
     drawing::{
-        collect::Collect,
         graph::{GetLayer, MakePrimitive, PrimitiveIndex},
+        Collect,
     },
     geometry::{
         shape::{AccessShape, Shape},

src/board/mod.rs

@@ -6,9 +6,7 @@
 //! between nodes, pins, and bands, as well as handle metadata and geometric data
 //! for layout construction.
 
-pub mod mesadata {
+pub use specctra_core::mesadata::AccessMesadata;
-    pub use specctra_core::mesadata::AccessMesadata;
-}
 
 use std::{cmp::Ordering, collections::BTreeMap};
 
@@ -17,14 +15,13 @@ use derive_getters::Getters;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    board::mesadata::AccessMesadata,
     drawing::{
         band::BandUid,
         bend::{BendIndex, BendWeight},
-        collect::Collect,
         dot::{DotIndex, DotWeight, FixedDotIndex, FixedDotWeight},
         graph::{GetLayer, GetMaybeNet, PrimitiveIndex, PrimitiveWeight},
         seg::{FixedSegIndex, FixedSegWeight, SegIndex, SegWeight},
+        Collect,
     },
     geometry::{edit::ApplyGeometryEdit, shape::AccessShape, GenericNode},
     graph::GenericIndex,

src/drawing/mod.rs

@@ -6,16 +6,19 @@
 pub mod graph;
 pub mod band;
 pub mod bend;
-pub mod cane;
+mod cane;
-pub mod collect;
+mod collect;
 pub mod dot;
 mod drawing;
 pub mod gear;
-pub mod guide;
+mod guide;
 pub mod head;
 pub mod loose;
 pub mod primitive;
 pub use specctra_core::rules;
 pub mod seg;
 
+pub use cane::Cane;
+pub use collect::Collect;
 pub use drawing::*;
+pub use guide::Guide;

src/interactor/activity.rs

@@ -14,7 +14,7 @@ use crate::{
             GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles, Invoker, InvokerError,
         },
     },
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::primitive::PrimitiveShape,
     interactor::interaction::{InteractionError, InteractionStepper},

src/interactor/interaction.rs

@@ -8,7 +8,7 @@ use thiserror::Error;
 
 use crate::{
     autorouter::invoker::{GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles},
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     drawing::graph::PrimitiveIndex,
     geometry::primitive::PrimitiveShape,
     router::{navcord::NavcordStepper, navmesh::Navmesh},

src/interactor/interactor.rs

@@ -13,7 +13,7 @@ use crate::{
         invoker::{Invoker, InvokerError},
         Autorouter,
     },
-    board::{mesadata::AccessMesadata, Board},
+    board::{AccessMesadata, Board},
     interactor::activity::{
         ActivityContext, ActivityError, ActivityStepperWithStatus, InteractiveInput,
     },

src/layout/layout.rs

@@ -12,7 +12,6 @@ use crate::{
     drawing::{
         band::BandTermsegIndex,
         bend::{BendIndex, BendWeight, LooseBendWeight},
-        cane::Cane,
         dot::{DotIndex, DotWeight, FixedDotIndex, FixedDotWeight, LooseDotIndex, LooseDotWeight},
         gear::GearIndex,
         graph::{GetMaybeNet, IsInLayer, MakePrimitive, PrimitiveIndex, PrimitiveWeight},
@@ -22,7 +21,7 @@ use crate::{
             FixedSegIndex, FixedSegWeight, LoneLooseSegIndex, LoneLooseSegWeight, SegIndex,
             SegWeight, SeqLooseSegIndex, SeqLooseSegWeight,
         },
-        Drawing, DrawingEdit, DrawingException, Infringement,
+        Cane, Drawing, DrawingEdit, DrawingException, Infringement,
     },
     geometry::{edit::ApplyGeometryEdit, shape::Shape, GenericNode},
     graph::{GenericIndex, GetPetgraphIndex},

src/router/draw.rs

@@ -15,12 +15,11 @@ use crate::{
         dot::{DotIndex, FixedDotIndex, LooseDotIndex, LooseDotWeight},
         gear::GearIndex,
         graph::{GetLayer, GetMaybeNet, MakePrimitive},
-        guide::Guide,
         head::{CaneHead, GetFace, Head},
         primitive::GetOtherJoint,
         rules::AccessRules,
         seg::{LoneLooseSegWeight, SeqLooseSegWeight},
-        DrawingException, Infringement,
+        DrawingException, Guide, Infringement,
     },
     layout::{Layout, LayoutEdit},
     math::{Circle, NoTangents},

src/router/mod.rs

@@ -7,7 +7,8 @@ pub mod draw;
 pub mod navcord;
 pub mod navcorder;
 pub mod navmesh;
-pub mod route;
+mod route;
-pub mod router;
+mod router;
 
+pub use route::RouteStepper;
 pub use router::*;

src/router/router.rs

@@ -12,11 +12,10 @@ use crate::{
         band::BandTermsegIndex,
         dot::{DotIndex, FixedDotIndex},
         graph::{MakePrimitive, PrimitiveIndex},
-        guide::Guide,
         head::GetFace,
         primitive::MakePrimitiveShape,
         rules::AccessRules,
-        Collision, DrawingException, Infringement,
+        Collision, DrawingException, Guide, Infringement,
     },
     geometry::{
         primitive::PrimitiveShape,

src/specctra/design.rs

@@ -11,7 +11,7 @@ use std::collections::{btree_map::Entry as BTreeMapEntry, BTreeMap};
 use geo::{point, Point, Rotate};
 
 use crate::{
-    board::{mesadata::AccessMesadata, Board},
+    board::{AccessMesadata, Board},
     drawing::{
         dot::FixedDotWeight,
         graph::{GetLayer, GetMaybeNet, MakePrimitive},

tests/common/mod.rs

@@ -11,7 +11,7 @@ use topola::{
         invoker::{Invoker, InvokerError},
         Autorouter,
     },
-    board::{mesadata::AccessMesadata, Board},
+    board::{AccessMesadata, Board},
     drawing::{
         dot::FixedDotIndex,
         graph::{GetLayer, GetMaybeNet},

tests/multilayer.rs

@@ -4,7 +4,7 @@
 
 use topola::{
     autorouter::{execution::Command, invoker::InvokerError, AutorouterError},
-    board::mesadata::AccessMesadata,
+    board::AccessMesadata,
     layout::via::ViaWeight,
     math::Circle,
 };