Restore imports that the cadcraft batch dropped so the engine compiles

Explicit import lists missed names the files still use. Restore them and
the test-module globs.
This commit is contained in:
Dylan M. Taylor
2026-10-25 19:13:49 -04:00
parent f1bb66b977
commit 6b681babc9
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
use serde_json::{Value, json};
use super::{CommandSpec, bad, point_param, str_param};
use super::{CommandSpec, always, bad, point_param, str_param};
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
+2 -2
View File
@@ -4,7 +4,7 @@ use cadcraft_doc::{EntityKind, Handle};
use cadcraft_geom::{Segment, Vec2};
use serde_json::{Value, json};
use super::{CommandSpec, bad, bool_or, point_param, points_param, str_param, targets};
use super::{CommandSpec, always, bad, bool_or, point_param, points_param, str_param, targets};
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
@@ -553,7 +553,7 @@ impl Interactive for AngleM {
#[cfg(test)]
mod tests {
use super::{CommandSpec, bad, bool_or, point_param, points_param, str_param, targets};
use super::*;
#[test]
fn calculator() {
+1 -1
View File
@@ -6,7 +6,7 @@ use cadcraft_geom::{Bounds2, Vec2};
use serde_json::{Value, json};
use super::machines::{SelectRun, number};
use super::{CommandSpec, bad, bool_or, f64_req, ok, point_req, str_param, targets};
use super::{CommandSpec, bad, bool_or, f64_or, f64_req, ok, point_param, point_req, str_param, targets};
use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step, View};