From f11562c998171703947bf5aa69edbe69e3e4be92 Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Thu, 28 Aug 2025 11:32:06 +0200
Subject: [PATCH 1/4] cargo: remove unused `editor/ron` feature

---
 desktop/wrapper/Cargo.toml | 1 -
 editor/Cargo.toml          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/desktop/wrapper/Cargo.toml b/desktop/wrapper/Cargo.toml
index 0a8704978a..5e61337515 100644
--- a/desktop/wrapper/Cargo.toml
+++ b/desktop/wrapper/Cargo.toml
@@ -16,7 +16,6 @@ gpu = ["graphite-editor/gpu"]
 # Local dependencies
 graphite-editor = { path = "../../editor", features = [
 	"gpu",
-	"ron",
 	"vello",
 ] }
 graphene-std = { workspace = true }
diff --git a/editor/Cargo.toml b/editor/Cargo.toml
index 6b36914df7..faf444b1a1 100644
--- a/editor/Cargo.toml
+++ b/editor/Cargo.toml
@@ -16,7 +16,6 @@ wasm = ["wasm-bindgen", "graphene-std/wasm"]
 gpu = ["interpreted-executor/gpu", "wgpu-executor"]
 resvg = ["graphene-std/resvg"]
 vello = ["graphene-std/vello", "resvg"]
-ron = []
 
 [dependencies]
 # Local dependencies

From f8a795339599f22402030fc51681b52fdab2e073 Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Thu, 28 Aug 2025 15:28:18 +0200
Subject: [PATCH 2/4] cargo: add wgpu-executor as a member, sort list

---
 Cargo.toml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 16fb0b781a..3b2b7ae23f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,28 +1,29 @@
 [workspace]
 members = [
-	"editor",
 	"desktop",
 	"desktop/wrapper",
 	"desktop/embedded-resources",
-	"proc-macros",
+	"editor",
 	"frontend/wasm",
+	"libraries/dyn-any",
+	"libraries/path-bool",
+	"libraries/math-parser",
 	"node-graph/gapplication-io",
 	"node-graph/gbrush",
 	"node-graph/gcore",
 	"node-graph/gcore-shaders",
-	"node-graph/gstd",
 	"node-graph/gmath-nodes",
 	"node-graph/gpath-bool",
 	"node-graph/graph-craft",
 	"node-graph/graphene-cli",
 	"node-graph/graster-nodes",
+	"node-graph/gstd",
 	"node-graph/gsvg-renderer",
 	"node-graph/interpreted-executor",
 	"node-graph/node-macro",
 	"node-graph/preprocessor",
-	"libraries/dyn-any",
-	"libraries/path-bool",
-	"libraries/math-parser",
+	"node-graph/wgpu-executor",
+	"proc-macros",
 ]
 default-members = [
 	"editor",

From e6244f9f7d5989d57bed1e046a47040e4df3d8fc Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Thu, 28 Aug 2025 15:30:38 +0200
Subject: [PATCH 3/4] cargo: test every crate by default

---
 .github/workflows/build-dev-and-ci.yml |  2 +-
 Cargo.toml                             | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-dev-and-ci.yml b/.github/workflows/build-dev-and-ci.yml
index c55019fa2b..52beaa02fb 100644
--- a/.github/workflows/build-dev-and-ci.yml
+++ b/.github/workflows/build-dev-and-ci.yml
@@ -108,7 +108,7 @@ jobs:
 
       - name: 🧪 Run Rust tests
         run: |
-          mold -run cargo test --all-features --workspace
+          mold -run cargo test --all-features
 
       - name: 📃 Generate code documentation info for website
         if: github.ref == 'refs/heads/master'
diff --git a/Cargo.toml b/Cargo.toml
index 3b2b7ae23f..8c157eed37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,20 +26,29 @@ members = [
 	"proc-macros",
 ]
 default-members = [
+	"desktop",
+	"desktop/wrapper",
 	"editor",
 	"frontend/wasm",
+	"libraries/dyn-any",
+	"libraries/path-bool",
+	"libraries/math-parser",
+	"node-graph/gapplication-io",
 	"node-graph/gbrush",
 	"node-graph/gcore",
 	"node-graph/gcore-shaders",
-	"node-graph/gstd",
 	"node-graph/gmath-nodes",
 	"node-graph/gpath-bool",
 	"node-graph/graph-craft",
 	"node-graph/graphene-cli",
 	"node-graph/graster-nodes",
+	"node-graph/gstd",
 	"node-graph/gsvg-renderer",
 	"node-graph/interpreted-executor",
 	"node-graph/node-macro",
+	"node-graph/preprocessor",
+	"node-graph/wgpu-executor",
+	"proc-macros",
 ]
 resolver = "2"
 

From 7b5ae441c64216ba49b6437a0d21adb0ae7dd3bb Mon Sep 17 00:00:00 2001
From: firestar99 <firestar99@sydow.cloud>
Date: Thu, 28 Aug 2025 15:30:53 +0200
Subject: [PATCH 4/4] cargo: disable testing of `graphite-proc-macros`

---
 Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8c157eed37..7c03345b42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,8 @@ default-members = [
 	"node-graph/node-macro",
 	"node-graph/preprocessor",
 	"node-graph/wgpu-executor",
-	"proc-macros",
+	# blocked by https://github.com/rust-lang/cargo/issues/15890
+#	"proc-macros",
 ]
 resolver = "2"