From 3cf36f8ba9853290c4a20133f1cc216c96e7f110 Mon Sep 17 00:00:00 2001 From: Timon Date: Sat, 25 Jul 2026 12:03:15 +0000 Subject: [PATCH] Remove now obsolete `disable-registration` special case from node macro --- Cargo.lock | 1 - frontend/wrapper/Cargo.toml | 5 ++--- node-graph/node-macro/Cargo.toml | 3 --- node-graph/node-macro/src/codegen.rs | 28 +++++++++++----------------- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d81925f98..12e730582b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2392,7 +2392,6 @@ dependencies = [ "graphite-proc-macros", "js-sys", "log", - "node-macro", "serde", "serde-wasm-bindgen", "serde_bytes", diff --git a/frontend/wrapper/Cargo.toml b/frontend/wrapper/Cargo.toml index 988d6b21df..2731828375 100644 --- a/frontend/wrapper/Cargo.toml +++ b/frontend/wrapper/Cargo.toml @@ -13,10 +13,10 @@ license = "Apache-2.0" [features] default = ["gpu", "shader-nodes", "web"] web = ["editor", "editor?/wasm"] -editor = ["dep:editor", "dep:graphene-std", "dep:graph-craft", "dep:node-macro", "dep:wgpu"] +editor = ["dep:editor", "dep:graphene-std", "dep:graph-craft", "dep:wgpu"] gpu = ["editor?/gpu"] shader-nodes = ["graphene-std?/shader-nodes", "gpu"] -native = ["node-macro?/disable-registration"] +native = [] [lib] crate-type = ["cdylib", "rlib"] @@ -39,7 +39,6 @@ wgpu = { workspace = true, optional = true } web-sys = { workspace = true } serde_json = { workspace = true } tsify = { workspace = true } -node-macro = { workspace = true, optional = true } [dev-dependencies] serde_bytes = { workspace = true } diff --git a/node-graph/node-macro/Cargo.toml b/node-graph/node-macro/Cargo.toml index 47dd09e896..b110e66cbf 100644 --- a/node-graph/node-macro/Cargo.toml +++ b/node-graph/node-macro/Cargo.toml @@ -13,9 +13,6 @@ license = "Apache-2.0" [lib] proc-macro = true -[features] -disable-registration = [] - [dependencies] # Workspace dependencies syn = { workspace = true } diff --git a/node-graph/node-macro/src/codegen.rs b/node-graph/node-macro/src/codegen.rs index b65024fe64..3df1e855f4 100644 --- a/node-graph/node-macro/src/codegen.rs +++ b/node-graph/node-macro/src/codegen.rs @@ -720,24 +720,18 @@ fn generate_register_node_impl(parsed: &ParsedNodeFn, field_names: &[&Ident], st ) )); } - let native = quote! { - #[cfg_attr(not(target_family = "wasm"), ctor)] - fn register_node() { - let mut registry = NODE_REGISTRY.lock().unwrap(); - registry.insert( - #identifier(), - vec![ - #(#constructors,)* - ] - ); - } - }; - if cfg!(feature = "disable-registration") { - return Ok(native); - } - Ok(quote! { - #native + #[cfg_attr(not(target_family = "wasm"), ctor)] + fn register_node() { + let mut registry = NODE_REGISTRY.lock().unwrap(); + registry.insert( + #identifier(), + vec![ + #(#constructors,)* + ] + ); + } + #wasm_shim }) }