diff --git a/src/autorouter/autorouter.rs b/src/autorouter/autorouter.rs index 5fc5428..0d208f1 100644 --- a/src/autorouter/autorouter.rs +++ b/src/autorouter/autorouter.rs @@ -14,10 +14,10 @@ use thiserror::Error; use crate::{ autorouter::{ - board::Board, ratsnest::{Ratsnest, RatvertexIndex}, selection::Selection, }, + board::Board, drawing::{ dot::FixedDotIndex, graph::{GetLayer, GetMaybeNet}, diff --git a/src/autorouter/mod.rs b/src/autorouter/mod.rs index fe4857d..41fb8d7 100644 --- a/src/autorouter/mod.rs +++ b/src/autorouter/mod.rs @@ -1,5 +1,4 @@ mod autorouter; -pub mod board; pub mod history; pub mod invoker; pub mod ratsnest; diff --git a/src/autorouter/selection.rs b/src/autorouter/selection.rs index 3f955b4..6f19ba1 100644 --- a/src/autorouter/selection.rs +++ b/src/autorouter/selection.rs @@ -3,7 +3,7 @@ use std::collections::HashSet; use serde::{Deserialize, Serialize}; use crate::{ - autorouter::board::Board, + board::Board, drawing::{ graph::{GetLayer, MakePrimitive, PrimitiveIndex}, rules::RulesTrait, diff --git a/src/bin/topola-egui/overlay.rs b/src/bin/topola-egui/overlay.rs index 84b0aad..d56e14c 100644 --- a/src/bin/topola-egui/overlay.rs +++ b/src/bin/topola-egui/overlay.rs @@ -5,7 +5,8 @@ use rstar::AABB; use spade::InsertionError; use topola::{ - autorouter::{board::Board, ratsnest::Ratsnest, selection::Selection}, + autorouter::{ratsnest::Ratsnest, selection::Selection}, + board::Board, drawing::{ graph::{GetLayer, MakePrimitive}, primitive::MakePrimitiveShape, diff --git a/src/autorouter/board.rs b/src/board/board.rs similarity index 100% rename from src/autorouter/board.rs rename to src/board/board.rs diff --git a/src/board/mod.rs b/src/board/mod.rs new file mode 100644 index 0000000..928e4c1 --- /dev/null +++ b/src/board/mod.rs @@ -0,0 +1,3 @@ +mod board; + +pub use board::*; diff --git a/src/dsn/design.rs b/src/dsn/design.rs index 6e2c9b2..4c030dc 100644 --- a/src/dsn/design.rs +++ b/src/dsn/design.rs @@ -4,7 +4,7 @@ use geo::{point, Point, Rotate, Translate}; use thiserror::Error; use crate::{ - autorouter::board::Board, + board::Board, drawing::{dot::FixedDotWeight, seg::FixedSegWeight, Drawing}, dsn::{ de, diff --git a/src/lib.rs b/src/lib.rs index fc75618a..7e09708 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,6 +4,7 @@ pub mod graph; #[macro_use] pub mod drawing; pub mod autorouter; +pub mod board; pub mod dsn; pub mod geometry; pub mod layout; diff --git a/tests/common/mod.rs b/tests/common/mod.rs index f2dedba..4a7aac8 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -3,11 +3,11 @@ use std::fs::File; use petgraph::{stable_graph::NodeIndex, unionfind::UnionFind, visit::NodeIndexable}; use topola::{ autorouter::{ - board::Board, history::HistoryError, invoker::{Invoker, InvokerError}, Autorouter, }, + board::Board, drawing::{ graph::{GetLayer, GetMaybeNet}, rules::RulesTrait,