From 2b69e6e94c5431ebc81b2435827160d4b45b5eb0 Mon Sep 17 00:00:00 2001 From: Hakan Seven Date: Fri, 18 Sep 2026 18:58:00 +0300 Subject: [PATCH] fix: point cadkernel at upstream after #1352; unify duplicate-constraint message - #1352 pinned cadkernel/cadkernel-constraints to ramox81's fork. Its one extra commit (cadkernel #67, SymmetricLineDirections) is now on HakanSeven12/cadkernel main as the same SHA, so the manifests and lock point back at the upstream repo at rev 0493b59. - SYCONSTRAINT reports a repeated relation with the same message Fix and Vertical use, as an error instead of plain output. - The knot-less spline test consumes the add_entity results. Co-Authored-By: Claude Fable 5.1 --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- src/app/command_driver.rs | 2 +- src/io/mod.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa5d9a726..f9d55c24f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -922,7 +922,7 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cadkernel" version = "0.1.0" -source = "git+https://github.com/ramox81/cadkernel.git?rev=0493b59#0493b59a06980e3b5b07bf3c73df0725a2e56c86" +source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=0493b59#0493b59a06980e3b5b07bf3c73df0725a2e56c86" dependencies = [ "acadrust", "cavalier_contours", @@ -933,7 +933,7 @@ dependencies = [ [[package]] name = "cadkernel-constraints" version = "0.1.0" -source = "git+https://github.com/ramox81/cadkernel.git?rev=0493b59#0493b59a06980e3b5b07bf3c73df0725a2e56c86" +source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=0493b59#0493b59a06980e3b5b07bf3c73df0725a2e56c86" dependencies = [ "nalgebra", ] diff --git a/Cargo.toml b/Cargo.toml index e82b603ce..40af11344 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,8 +34,8 @@ clap = { version = "4", features = ["derive", "string"] } env_logger = "0.11" log = "0.4" acadrust = { git = "https://github.com/HakanSeven12/cadcodec.git", rev = "8a28c21", features = ["serde"] } -cadkernel = { git = "https://github.com/ramox81/cadkernel.git", rev = "0493b59", features = ["acis", "offset"] } -cadkernel-constraints = { git = "https://github.com/ramox81/cadkernel.git", rev = "0493b59" } +cadkernel = { git = "https://github.com/HakanSeven12/cadkernel.git", rev = "0493b59", features = ["acis", "offset"] } +cadkernel-constraints = { git = "https://github.com/HakanSeven12/cadkernel.git", rev = "0493b59" } dwg-thumbnailer = { path = "crates/dwg-thumbnailer" } flate2 = "1" image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp", "tiff"] } diff --git a/src/app/command_driver.rs b/src/app/command_driver.rs index b851fe181..d8a2f787a 100644 --- a/src/app/command_driver.rs +++ b/src/app/command_driver.rs @@ -3591,7 +3591,7 @@ impl OpenCADStudio { self.tabs[i].active_cmd = None; self.tabs[i].snap_result = None; self.command_line - .push_output("The Symmetric constraint already exists."); + .push_error("The constraint already exists on the selected objects."); return Task::none(); } let constraints_before = self.tabs[i] diff --git a/src/io/mod.rs b/src/io/mod.rs index 67053222f..ab42d1434 100644 --- a/src/io/mod.rs +++ b/src/io/mod.rs @@ -2419,8 +2419,8 @@ mod corrupt_guard_tests { #[test] fn knotless_spline_with_too_few_points_is_lowered_and_saves_as_dwg() { let mut doc = CadDocument::new(); - doc.add_entity(EntityType::Spline(knotless_spline(3, 2))); - doc.add_entity(EntityType::Spline(knotless_spline(3, 1))); + doc.add_entity(EntityType::Spline(knotless_spline(3, 2))).unwrap(); + doc.add_entity(EntityType::Spline(knotless_spline(3, 1))).unwrap(); assert_eq!(purge_corrupt_entities(&mut doc), 1, "the lone point is dropped"); let spline = doc .entities()