Move `topola/src/compounds/` directory under `topola/src/layout/`

topola/src/board/mod.rs

@@ -12,10 +12,10 @@ use derive_getters::Getters;
 use undoredo::{Delta, Recorder};
 
 use crate::{
-    compounds::{ComponentId, NetId, PinId},
     layout::LayerId,
     layout::{
         Layout, LayoutHalfDelta,
+        compounds::{ComponentId, NetId, PinId},
         primitives::{
             JointId, JointSpec, Polygon, PolygonId, Segment, SegmentId, SegmentSpec, Via, ViaId,
             ViaSpec,

topola/src/board/resolve.rs

@@ -4,7 +4,7 @@
 
 use crate::{
     board::{Board, selections::ComponentSelection},
-    compounds::ComponentId,
+    layout::compounds::ComponentId,
 };
 
 impl Board {

topola/src/board/transforms/move_by.rs

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Board, Vector2, compounds::ComponentId, selections::ComponentSelection};
+use crate::{Board, Vector2, layout::compounds::ComponentId, selections::ComponentSelection};
 
 impl Board {
     pub fn move_components_by(

topola/src/layout/compounds/component.rs

@@ -5,7 +5,7 @@
 use derive_more::{Constructor, From};
 use serde::{Deserialize, Serialize};
 
-use crate::primitives::{JointId, PolygonId, SegmentId, ViaId};
+use crate::layout::primitives::{JointId, PolygonId, SegmentId, ViaId};
 
 #[derive(
     Clone,

topola/src/layout/compounds/pin.rs

@@ -5,7 +5,7 @@
 use derive_more::{Constructor, From};
 use serde::{Deserialize, Serialize};
 
-use crate::primitives::{JointId, PolygonId, SegmentId, ViaId};
+use crate::layout::primitives::{JointId, PolygonId, SegmentId, ViaId};
 
 #[derive(
     Clone,

topola/src/layout/mod.rs

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+pub mod compounds;
 pub mod primitives;
 mod transforms;
 
@@ -17,7 +18,7 @@ use undoredo::aliases::RTreeHalfDelta;
 use undoredo::{Delta, Recorder};
 
 use crate::{
-    compounds::{Component, ComponentId, Pin, PinId},
+    layout::compounds::{Component, ComponentId, Pin, PinId},
     layout::primitives::{
         Joint, JointId, JointSpec, Polygon, PolygonId, Segment, SegmentId, SegmentSpec, Via, ViaId,
         ViaSpec,

topola/src/layout/primitives/joint.rs

@@ -6,8 +6,8 @@ use derive_more::{Constructor, From};
 use rstar::{AABB, primitives::Rectangle};
 use serde::{Deserialize, Serialize};
 
-use crate::compounds::{ComponentId, NetId, PinId};
 use crate::layout::LayerId;
+use crate::layout::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
 
 use super::{SegmentId, ViaId};

topola/src/layout/primitives/polygon.rs

@@ -6,8 +6,8 @@ use derive_more::{Constructor, From};
 use rstar::{AABB, Envelope, primitives::Rectangle};
 use serde::{Deserialize, Serialize};
 
-use crate::compounds::{ComponentId, NetId, PinId};
 use crate::layout::LayerId;
+use crate::layout::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
 
 #[derive(

topola/src/layout/primitives/segment.rs

@@ -6,8 +6,8 @@ use derive_more::{Constructor, From};
 use rstar::primitives::Rectangle;
 use serde::{Deserialize, Serialize};
 
-use crate::compounds::{ComponentId, NetId, PinId};
 use crate::layout::LayerId;
+use crate::layout::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
 
 use super::JointId;

topola/src/layout/primitives/via.rs

@@ -6,8 +6,8 @@ use derive_more::{Constructor, From};
 use rstar::{AABB, primitives::Rectangle};
 use serde::{Deserialize, Serialize};
 
-use crate::compounds::{ComponentId, NetId, PinId};
 use crate::layout::LayerId;
+use crate::layout::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
 
 use super::JointId;

topola/src/layout/transforms/move_by.rs

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Layout, compounds::ComponentId, math::Vector2};
+use crate::{Layout, layout::compounds::ComponentId, math::Vector2};
 
 impl Layout {
     pub fn move_component_by(&mut self, id: ComponentId, translation: Vector2<i64>) {

topola/src/lib.rs

@@ -4,7 +4,6 @@
 
 mod autorouter;
 mod board;
-mod compounds;
 mod drawer;
 mod layout;
 mod math;
@@ -17,9 +16,9 @@ mod specctra;
 pub use crate::autorouter::Autorouter;
 pub use crate::board::Board;
 pub use crate::board::selections;
-pub use crate::compounds::{Pin, PinId};
 pub use crate::layout::LayerId;
 pub use crate::layout::Layout;
+pub use crate::layout::compounds::{Pin, PinId};
 pub use crate::layout::primitives;
 pub use crate::math::Vector2;
 pub use crate::ratsnest::{Ratline, Ratsnest};

topola/src/ratsnest.rs

@@ -10,8 +10,8 @@ use spade::{DelaunayTriangulation, HasPosition, Triangulation, handles::FixedVer
 
 use crate::{
     Board,
-    compounds::NetId,
     layout::LayerId,
+    layout::compounds::NetId,
     math::Vector2,
     primitives::{JointId, PolygonId, PrimitiveId, SegmentId},
 };

topola/src/specctra.rs

@@ -12,8 +12,8 @@ use specctra::{
 
 use crate::{
     board::Board,
-    compounds::{ComponentId, NetId, PinId},
     layout::LayerId,
+    layout::compounds::{ComponentId, NetId, PinId},
     math::Vector2,
     primitives::{JointSpec, Polygon, Segment, SegmentSpec},
 };