diff --git a/node-graph/node-macro/src/codegen.rs b/node-graph/node-macro/src/codegen.rs index 6e60cdd8b9..7beb762e78 100644 --- a/node-graph/node-macro/src/codegen.rs +++ b/node-graph/node-macro/src/codegen.rs @@ -136,7 +136,7 @@ pub(crate) fn generate_node_code(crate_ident: &CrateIdent, parsed: &ParsedNodeFn // record-io node's secondary inputs read erased off their wire, so a // generic one of them names is carried too. let ctx_ident_for_flip = context_param(parsed).map(|ctx| ctx.ident.clone()); - let ranked_carries = |ident: &Ident| { + let carries_generic = |ident: &Ident| { regular_fields.iter().enumerate().any(|(index, field)| match &field.ty { ParsedFieldType::Regular(RegularParsedField { ty, list_levels, .. }) => (*list_levels > 0 || (record_io && index > 0)) && type_contains_ident(ty, ident), _ => false, @@ -145,7 +145,7 @@ pub(crate) fn generate_node_code(crate_ident: &CrateIdent, parsed: &ParsedNodeFn let carried_generics: Vec<&syn::GenericParam> = fn_generics .iter() .filter(|param| match param { - syn::GenericParam::Type(tp) => Some(&tp.ident) != ctx_ident_for_flip.as_ref() && !data_field_generic_idents.contains(&tp.ident) && (flip || ranked_carries(&tp.ident)), + syn::GenericParam::Type(tp) => Some(&tp.ident) != ctx_ident_for_flip.as_ref() && !data_field_generic_idents.contains(&tp.ident) && (flip || carries_generic(&tp.ident)), _ => false, }) .collect(); diff --git a/node-graph/node-macro/src/codegen/ir.rs b/node-graph/node-macro/src/codegen/ir.rs index d7750d58c8..51d36fb2ef 100644 --- a/node-graph/node-macro/src/codegen/ir.rs +++ b/node-graph/node-macro/src/codegen/ir.rs @@ -105,14 +105,7 @@ fn output(parsed: &ParsedNodeFn, generics: &[Ident]) -> Output { }) .collect(), }, - removes: removes - .into_iter() - .map(|marker| LevelAttr { - marker, - level: 0, - owned: false, - }) - .collect(), + removes: removes.into_iter().map(|marker| LevelAttr { marker, level: 0, owned: false }).collect(), gathers, } } diff --git a/node-graph/nodes/gstd/src/platform_application_io.rs b/node-graph/nodes/gstd/src/platform_application_io.rs index 0fb37a04d0..b78901ccc1 100644 --- a/node-graph/nodes/gstd/src/platform_application_io.rs +++ b/node-graph/nodes/gstd/src/platform_application_io.rs @@ -2,10 +2,10 @@ use base64::Engine; #[cfg(target_family = "wasm")] use canvas_utils::{Canvas, CanvasHandle}; -use core_types::color::SRGBA8; -use core_types::gpoll::GPoll; #[cfg(target_family = "wasm")] use core_types::attribute::{Attr, OwnedAttr, Transform}; +use core_types::color::SRGBA8; +use core_types::gpoll::GPoll; #[cfg(target_family = "wasm")] use core_types::list::List; @@ -25,11 +25,11 @@ pub use graphene_canvas_utils as canvas_utils; #[cfg(target_family = "wasm")] use graphic_types::Graphic; #[cfg(target_family = "wasm")] -use graphic_types::markers::EditorMergedLayers; -#[cfg(target_family = "wasm")] use graphic_types::IntoGraphicList; #[cfg(target_family = "wasm")] use graphic_types::Vector; +#[cfg(target_family = "wasm")] +use graphic_types::markers::EditorMergedLayers; use graphic_types::raster_types::Image; use graphic_types::raster_types::{CPU, Raster}; #[cfg(target_family = "wasm")]