From 92830dd2a3a4f7bee2378fdc0d0ace147150e9c4 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Mon, 18 Aug 2025 17:44:29 +0200 Subject: [PATCH 1/3] cargo shear --- Cargo.lock | 12 ------------ Cargo.toml | 1 - editor/Cargo.toml | 8 ++------ node-graph/gcore-shaders/Cargo.toml | 1 - node-graph/gpath-bool/Cargo.toml | 1 - node-graph/gstd/Cargo.toml | 8 -------- 6 files changed, 2 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ea1907834..995e4057aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1972,7 +1972,6 @@ dependencies = [ "bytemuck", "dyn-any", "glam", - "graphene-core", "half", "log", "num-derive", @@ -2000,7 +1999,6 @@ dependencies = [ "dyn-any", "glam", "graphene-core", - "kurbo", "log", "node-macro", "path-bool", @@ -2035,10 +2033,7 @@ name = "graphene-std" version = "0.1.0" dependencies = [ "base64 0.22.1", - "bytemuck", "dyn-any", - "fastnoise-lite", - "futures", "glam", "graph-craft", "graphene-application-io", @@ -2050,10 +2045,7 @@ dependencies = [ "graphene-svg-renderer", "image", "log", - "ndarray", "node-macro", - "rand 0.9.1", - "rand_chacha 0.9.0", "reqwest", "tokio", "vello", @@ -2112,7 +2104,6 @@ version = "0.0.0" dependencies = [ "base64 0.22.1", "bitflags 2.9.1", - "bytemuck", "derivative", "dyn-any", "env_logger", @@ -2128,18 +2119,15 @@ dependencies = [ "num_enum", "once_cell", "preprocessor", - "ron", "serde", "serde_json", "specta", "spin", "thiserror 2.0.12", "tokio", - "tracing", "usvg", "vello", "wasm-bindgen", - "wasm-bindgen-futures", "web-sys", "wgpu-executor", ] diff --git a/Cargo.toml b/Cargo.toml index 88358d8e81..9ce23998bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,6 @@ thiserror = "2" anyhow = "1.0" proc-macro2 = { version = "1", features = ["span-locations"] } quote = "1.0" -axum = "0.8" chrono = "0.4" ron = "0.8" fastnoise-lite = "1.1" diff --git a/editor/Cargo.toml b/editor/Cargo.toml index 1ecd998673..6b36914df7 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -12,11 +12,11 @@ license = "Apache-2.0" [features] default = ["wasm"] -wasm = ["wasm-bindgen", "graphene-std/wasm", "wasm-bindgen-futures"] +wasm = ["wasm-bindgen", "graphene-std/wasm"] gpu = ["interpreted-executor/gpu", "wgpu-executor"] resvg = ["graphene-std/resvg"] vello = ["graphene-std/vello", "resvg"] -ron = ["dep:ron"] +ron = [] [dependencies] # Local dependencies @@ -43,9 +43,7 @@ num_enum = { workspace = true } usvg = { workspace = true } once_cell = { workspace = true } web-sys = { workspace = true } -bytemuck = { workspace = true } vello = { workspace = true } -tracing = { workspace = true } base64 = { workspace = true } # Required dependencies @@ -56,8 +54,6 @@ wgpu-executor = { workspace = true, optional = true } # Optional workspace dependencies wasm-bindgen = { workspace = true, optional = true } -wasm-bindgen-futures = { workspace = true, optional = true } -ron = { workspace = true, optional = true } [dev-dependencies] # Workspace dependencies diff --git a/node-graph/gcore-shaders/Cargo.toml b/node-graph/gcore-shaders/Cargo.toml index 0fefb577af..84da44df58 100644 --- a/node-graph/gcore-shaders/Cargo.toml +++ b/node-graph/gcore-shaders/Cargo.toml @@ -26,7 +26,6 @@ specta = { workspace = true, optional = true } log = { workspace = true, optional = true } [dev-dependencies] -graphene-core = { workspace = true } [lints.rust] # the spirv target is not in the list of common cfgs so must be added manually diff --git a/node-graph/gpath-bool/Cargo.toml b/node-graph/gpath-bool/Cargo.toml index beec63cb14..9882a75c6e 100644 --- a/node-graph/gpath-bool/Cargo.toml +++ b/node-graph/gpath-bool/Cargo.toml @@ -16,4 +16,3 @@ specta = { workspace = true } log = { workspace = true } path-bool = { workspace = true } serde = { workspace = true } -kurbo = { workspace = true } diff --git a/node-graph/gstd/Cargo.toml b/node-graph/gstd/Cargo.toml index 0c20bd8f31..6eb7e8a075 100644 --- a/node-graph/gstd/Cargo.toml +++ b/node-graph/gstd/Cargo.toml @@ -36,15 +36,10 @@ graphene-raster-nodes = { workspace = true } graphene-brush = { workspace = true } # Workspace dependencies -fastnoise-lite = { workspace = true } log = { workspace = true } glam = { workspace = true } node-macro = { workspace = true } reqwest = { workspace = true } -futures = { workspace = true } -rand_chacha = { workspace = true } -rand = { workspace = true } -bytemuck = { workspace = true } image = { workspace = true } base64 = { workspace = true } @@ -65,8 +60,5 @@ web-sys = { workspace = true, optional = true, features = [ "ImageBitmapRenderingContext", ] } -# Required dependencies -ndarray = "0.16.1" - [dev-dependencies] tokio = { workspace = true } From b77a34f031e28950b89c04f14408803c7b5e9f03 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Mon, 18 Aug 2025 18:01:18 +0200 Subject: [PATCH 2/3] fix warnings on master --- .../document/overlays/utility_types_vello.rs | 1 + node-graph/gcore/src/subpath/structs.rs | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/editor/src/messages/portfolio/document/overlays/utility_types_vello.rs b/editor/src/messages/portfolio/document/overlays/utility_types_vello.rs index 3f31a85d4a..584c64b088 100644 --- a/editor/src/messages/portfolio/document/overlays/utility_types_vello.rs +++ b/editor/src/messages/portfolio/document/overlays/utility_types_vello.rs @@ -202,6 +202,7 @@ impl core::hash::Hash for OverlayContext { } impl OverlayContext { + #[allow(dead_code)] pub(super) fn new(size: DVec2, device_pixel_ratio: f64, visibility_settings: OverlaysVisibilitySettings) -> Self { Self { internal: Arc::new(Mutex::new(OverlayContextInternal::new(size, device_pixel_ratio, visibility_settings))), diff --git a/node-graph/gcore/src/subpath/structs.rs b/node-graph/gcore/src/subpath/structs.rs index e4d2ac21d7..d5f868be2b 100644 --- a/node-graph/gcore/src/subpath/structs.rs +++ b/node-graph/gcore/src/subpath/structs.rs @@ -10,18 +10,6 @@ pub trait Identifier: Sized + Clone + PartialEq + Hash + 'static { fn new() -> Self; } -/// An empty id type for use in tests -#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)] -#[cfg(test)] -pub(crate) struct EmptyId; - -#[cfg(test)] -impl Identifier for EmptyId { - fn new() -> Self { - Self - } -} - /// Structure used to represent a single anchor with up to two optional associated handles along a `Subpath` #[derive(Copy, Clone, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] From 1ff8bdd188aaffd213955fdfccddfa43d5e02902 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Mon, 18 Aug 2025 18:22:21 +0200 Subject: [PATCH 3/3] fix docs needing dev-dependency --- Cargo.lock | 1 + node-graph/gcore-shaders/Cargo.toml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 995e4057aa..102a4fda1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1972,6 +1972,7 @@ dependencies = [ "bytemuck", "dyn-any", "glam", + "graphene-core", "half", "log", "num-derive", diff --git a/node-graph/gcore-shaders/Cargo.toml b/node-graph/gcore-shaders/Cargo.toml index 84da44df58..9759217f0d 100644 --- a/node-graph/gcore-shaders/Cargo.toml +++ b/node-graph/gcore-shaders/Cargo.toml @@ -26,9 +26,13 @@ specta = { workspace = true, optional = true } log = { workspace = true, optional = true } [dev-dependencies] +graphene-core = { workspace = true } [lints.rust] # the spirv target is not in the list of common cfgs so must be added manually unexpected_cfgs = { level = "warn", check-cfg = [ 'cfg(target_arch, values("spirv"))', ] } + +[package.metadata.cargo-shear] +ignored = ["graphene-core"]