fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 22:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Name the generic-carry predicate for what it now covers

Browse Source
This commit is contained in:
Dennis Kobert
2026-09-05 12:23:34 +00:00
parent 39ce55ab61
commit 40efbc3261
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node-graph/node-macro/src/codegen.rs
View File

@@ -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();

9
node-graph/node-macro/src/codegen/ir.rs
View File

@@ -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,
}
}

8
node-graph/nodes/gstd/src/platform_application_io.rs
View File

@@ -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")]