From 6e33634af2fc547fa499da9887dae98a136c1781 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Wed, 17 Dec 2025 14:23:02 +0100 Subject: [PATCH 1/2] Use glob syntax for Cargo.toml --- Cargo.lock | 7 ------- Cargo.toml | 35 +++-------------------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 86c97660c8..c15bda86a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4832,13 +4832,6 @@ dependencies = [ "log", ] -[[package]] -name = "raster-nodes-shaders-entrypoint" -version = "0.1.0" -dependencies = [ - "raster-nodes", -] - [[package]] name = "raster-types" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 1a7fbd44bb..03d3881ef2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,26 +12,8 @@ members = [ "libraries/dyn-any", "libraries/path-bool", "libraries/math-parser", - "node-graph/libraries/application-io", - "node-graph/libraries/core-types", - "node-graph/libraries/no-std-types", - "node-graph/libraries/raster-types", - "node-graph/libraries/vector-types", - "node-graph/libraries/graphic-types", - "node-graph/libraries/rendering", - "node-graph/libraries/wgpu-executor", - "node-graph/nodes/blending", - "node-graph/nodes/brush", - "node-graph/nodes/gcore", - "node-graph/nodes/graphic", - "node-graph/nodes/math", - "node-graph/nodes/path-bool", - "node-graph/nodes/raster", - "node-graph/nodes/raster/shaders", - "node-graph/nodes/raster/shaders/entrypoint", - "node-graph/nodes/text", - "node-graph/nodes/transform", - "node-graph/nodes/vector", + "node-graph/libraries/*", + "node-graph/nodes/*", "node-graph/graph-craft", "node-graph/graphene-cli", "node-graph/nodes/gstd", @@ -55,20 +37,9 @@ default-members = [ "node-graph/libraries/graphic-types", "node-graph/libraries/rendering", "node-graph/libraries/wgpu-executor", - "node-graph/nodes/blending", - "node-graph/nodes/brush", - "node-graph/nodes/gcore", - "node-graph/nodes/graphic", - "node-graph/nodes/math", - "node-graph/nodes/path-bool", - "node-graph/nodes/raster", - "node-graph/nodes/raster/shaders", - "node-graph/nodes/text", - "node-graph/nodes/transform", - "node-graph/nodes/vector", + "node-graph/nodes/*", "node-graph/graph-craft", "node-graph/graphene-cli", - "node-graph/nodes/gstd", "node-graph/interpreted-executor", "node-graph/node-macro", "node-graph/preprocessor", From d0504290da20b9d57ecda19320ba9eca669f98cf Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sat, 20 Dec 2025 11:52:27 +0100 Subject: [PATCH 2/2] Readd nested crates to workspace members and reduce the list of default members --- Cargo.lock | 7 +++++++ Cargo.toml | 13 +++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c15bda86a6..86c97660c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4832,6 +4832,13 @@ dependencies = [ "log", ] +[[package]] +name = "raster-nodes-shaders-entrypoint" +version = "0.1.0" +dependencies = [ + "raster-nodes", +] + [[package]] name = "raster-types" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 03d3881ef2..e89ad67a50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,8 @@ members = [ "libraries/math-parser", "node-graph/libraries/*", "node-graph/nodes/*", + "node-graph/nodes/raster/shaders", + "node-graph/nodes/raster/shaders/entrypoint", "node-graph/graph-craft", "node-graph/graphene-cli", "node-graph/nodes/gstd", @@ -29,21 +31,12 @@ default-members = [ "libraries/dyn-any", "libraries/path-bool", "libraries/math-parser", - "node-graph/libraries/application-io", - "node-graph/libraries/core-types", - "node-graph/libraries/no-std-types", - "node-graph/libraries/raster-types", - "node-graph/libraries/vector-types", - "node-graph/libraries/graphic-types", - "node-graph/libraries/rendering", - "node-graph/libraries/wgpu-executor", - "node-graph/nodes/*", "node-graph/graph-craft", "node-graph/graphene-cli", "node-graph/interpreted-executor", "node-graph/node-macro", "node-graph/preprocessor", - # blocked by https://github.com/rust-lang/cargo/issues/15890 + # blocked by https://github.com/rust-lang/cargo/issues/16000 # "proc-macros", ] resolver = "2"