Skip to content

Commit d76de01

Browse files
Firestar99Firestar99
committed
turn identifier fn into a constant
1 parent 24eeb94 commit d76de01

File tree

10 files changed

+66
-74
lines changed

10 files changed

+66
-74
lines changed

‎editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs‎

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎editor/src/messages/tool/common_functionality/shapes/ellipse_shape.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ mod test_ellipse {
7777
layers
7878
.filter_map(|layer| {
7979
let node_graph_layer = NodeGraphLayer::new(layer, &document.network_interface);
80-
let ellipse_node = node_graph_layer.upstream_node_id_from_protonode(ellipse::identifier())?;
80+
let ellipse_node = node_graph_layer.upstream_node_id_from_protonode(ellipse::IDENTIFIER)?;
8181
Some(ResolvedEllipse {
8282
radius_x: instrumented.grab_protonode_input::<ellipse::RadiusXInput>(&vec![ellipse_node], &editor.runtime).unwrap(),
8383
radius_y: instrumented.grab_protonode_input::<ellipse::RadiusYInput>(&vec![ellipse_node], &editor.runtime).unwrap(),

‎editor/src/node_graph_executor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ mod test {
458458
for (input, monitor_id) in monitor_nodes {
459459
let monitor_node = DocumentNode {
460460
inputs: vec![input],
461-
implementation: DocumentNodeImplementation::ProtoNode(graphene_std::memo::monitor::identifier()),
461+
implementation: DocumentNodeImplementation::ProtoNode(graphene_std::memo::monitor::IDENTIFIER),
462462
manual_composition: Some(graph_craft::generic!(T)),
463463
skip_deduplication: true,
464464
..Default::default()

‎editor/src/node_graph_executor/runtime.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ impl InspectState {
435435

436436
let monitor_node = DocumentNode {
437437
inputs: vec![NodeInput::node(inspect_node, 0)], // Connect to the primary output of the inspect node
438-
implementation: DocumentNodeImplementation::ProtoNode(graphene_std::memo::monitor::identifier()),
438+
implementation: DocumentNodeImplementation::ProtoNode(graphene_std::memo::monitor::IDENTIFIER),
439439
manual_composition: Some(graph_craft::generic!(T)),
440440
skip_deduplication: true,
441441
..Default::default()

‎node-graph/gcore/src/memo.rs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ impl<T, CachedNode> MemoNode<T, CachedNode> {
5151
}
5252

5353
pub mod memo {
54-
pub fn identifier() -> crate::ProtoNodeIdentifier {
55-
crate::ProtoNodeIdentifier::from("graphene_core::memo::MemoNode")
56-
}
54+
pub const IDENTIFIER: crate::ProtoNodeIdentifier = crate::ProtoNodeIdentifier::new("graphene_core::memo::MemoNode");
5755
}
5856

5957
/// Caches the output of a given Node and acts as a proxy.
@@ -106,9 +104,7 @@ impl<T, I, CachedNode> ImpureMemoNode<I, T, CachedNode> {
106104
}
107105

108106
pub mod impure_memo {
109-
pub fn identifier() -> crate::ProtoNodeIdentifier {
110-
crate::ProtoNodeIdentifier::from("graphene_core::memo::ImpureMemoNode")
111-
}
107+
pub const IDENTIFIER: crate::ProtoNodeIdentifier = crate::ProtoNodeIdentifier::new("graphene_core::memo::ImpureMemoNode");
112108
}
113109

114110
/// Stores both what a node was called with and what it returned.
@@ -156,9 +152,7 @@ impl<I, T, N> MonitorNode<I, T, N> {
156152
}
157153

158154
pub mod monitor {
159-
pub fn identifier() -> crate::ProtoNodeIdentifier {
160-
crate::ProtoNodeIdentifier::from("graphene_core::memo::MonitorNode")
161-
}
155+
pub const IDENTIFIER: crate::ProtoNodeIdentifier = crate::ProtoNodeIdentifier::new("graphene_core::memo::MonitorNode");
162156
}
163157

164158
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]

‎node-graph/graph-craft/src/document.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,15 +1535,15 @@ mod test {
15351535
NodeId(1),
15361536
DocumentNode {
15371537
inputs: vec![NodeInput::network(concrete!(u32), 0)],
1538-
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::ops::identity::identifier()),
1538+
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::ops::identity::IDENTIFIER),
15391539
..Default::default()
15401540
},
15411541
),
15421542
(
15431543
NodeId(2),
15441544
DocumentNode {
15451545
inputs: vec![NodeInput::network(concrete!(u32), 1)],
1546-
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::ops::identity::identifier()),
1546+
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::ops::identity::IDENTIFIER),
15471547
..Default::default()
15481548
},
15491549
),
@@ -1570,7 +1570,7 @@ mod test {
15701570
NodeId(2),
15711571
DocumentNode {
15721572
inputs: vec![result_node_input],
1573-
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::ops::identity::identifier()),
1573+
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::ops::identity::IDENTIFIER),
15741574
..Default::default()
15751575
},
15761576
),

‎node-graph/interpreted-executor/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mod tests {
2020
NodeId(0),
2121
DocumentNode {
2222
inputs: vec![NodeInput::network(concrete!(u32), 0)],
23-
implementation: DocumentNodeImplementation::ProtoNode(ops::identity::identifier()),
23+
implementation: DocumentNodeImplementation::ProtoNode(ops::identity::IDENTIFIER),
2424
..Default::default()
2525
},
2626
),

‎node-graph/interpreted-executor/src/util.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub fn wrap_network_in_scope(mut network: NodeNetwork, editor_api: Arc<WasmEdito
3939
DocumentNode {
4040
manual_composition: Some(concrete!(Context)),
4141
inputs: vec![NodeInput::node(NodeId(0), 0)],
42-
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::memo::memo::identifier()),
42+
implementation: DocumentNodeImplementation::ProtoNode(graphene_core::memo::memo::IDENTIFIER),
4343
..Default::default()
4444
},
4545
// TODO: Add conversion step
@@ -68,7 +68,7 @@ pub fn wrap_network_in_scope(mut network: NodeNetwork, editor_api: Arc<WasmEdito
6868
inner_network,
6969
render_node,
7070
DocumentNode {
71-
implementation: DocumentNodeImplementation::ProtoNode(graphene_std::ops::identity::identifier()),
71+
implementation: DocumentNodeImplementation::ProtoNode(graphene_std::ops::identity::IDENTIFIER),
7272
inputs: vec![NodeInput::value(TaggedValue::EditorApi(editor_api), false)],
7373
..Default::default()
7474
},

‎node-graph/node-macro/src/codegen.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ pub(crate) fn generate_node_code(parsed: &ParsedNodeFn) -> syn::Result<TokenStre
359359
#eval_impl
360360
}
361361

362-
fn #identifier() -> #graphene_core::ProtoNodeIdentifier {
363-
#graphene_core::ProtoNodeIdentifier::from(std::concat!(#identifier_path, "::", std::stringify!(#struct_name)))
362+
const fn #identifier() -> #graphene_core::ProtoNodeIdentifier {
363+
#graphene_core::ProtoNodeIdentifier::new(std::concat!(#identifier_path, "::", std::stringify!(#struct_name)))
364364
}
365365

366366
#[doc(inline)]
@@ -470,7 +470,7 @@ fn generate_node_input_references(parsed: &ParsedNodeFn, fn_generics: &[crate::G
470470
impl <#(#used),*> #graphene_core::NodeInputDecleration for #struct_name <#(#fn_generic_params),*> {
471471
const INDEX: usize = #input_index;
472472
fn identifier() -> #graphene_core::ProtoNodeIdentifier {
473-
#identifier()
473+
#inputs_module_name::IDENTIFIER.clone()
474474
}
475475
type Result = #ty;
476476
}
@@ -483,9 +483,7 @@ fn generate_node_input_references(parsed: &ParsedNodeFn, fn_generics: &[crate::G
483483
use super::*;
484484

485485
/// The `ProtoNodeIdentifier` of this node without any generics attached to it
486-
pub fn identifier() -> #graphene_core::ProtoNodeIdentifier {
487-
#identifier()
488-
}
486+
pub const IDENTIFIER: #graphene_core::ProtoNodeIdentifier = #identifier();
489487
#(#generated_input_accessor)*
490488
}
491489
}

‎node-graph/preprocessor/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn generate_node_substitutions() -> HashMap<ProtoNodeIdentifier, DocumentNod
4949
let input_count = inputs.len();
5050
let network_inputs = (0..input_count).map(|i| NodeInput::node(NodeId(i as u64), 0)).collect();
5151

52-
let identity_node = ops::identity::identifier();
52+
let identity_node = ops::identity::IDENTIFIER;
5353

5454
let into_node_registry = &interpreted_executor::node_registry::NODE_REGISTRY;
5555

0 commit comments

Comments
 (0)