Skip to content

Commit 3650930

Browse files
committed
Clean up migrations
1 parent 276b7d8 commit 3650930

File tree

3 files changed

+42
-41
lines changed

3 files changed

+42
-41
lines changed

editor/src/messages/portfolio/document_migration.rs

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
109109
node: graphene_std::animation::real_time::IDENTIFIER,
110110
aliases: &["graphene_core::animation::RealTimeNode"],
111111
},
112-
NodeReplacement {
113-
node: graphene_std::text_nodes::serialize::IDENTIFIER,
114-
aliases: &["graphene_core::logic::SerializeNode", "graphene_core::text::SerializeNode"],
115-
},
116112
NodeReplacement {
117113
node: graphene_std::debug::size_of::IDENTIFIER,
118114
aliases: &["graphene_core::ops::SizeOfNode"],
@@ -121,38 +117,6 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
121117
node: graphene_std::debug::some::IDENTIFIER,
122118
aliases: &["graphene_core::ops::SomeNode"],
123119
},
124-
NodeReplacement {
125-
node: graphene_std::text_nodes::string_concatenate::IDENTIFIER,
126-
aliases: &["graphene_core::logic::StringConcatenateNode", "graphene_core::text::StringConcatenateNode"],
127-
},
128-
NodeReplacement {
129-
node: graphene_std::text_nodes::string_length::IDENTIFIER,
130-
aliases: &["graphene_core::logic::StringLengthNode", "graphene_core::text::StringLengthNode"],
131-
},
132-
NodeReplacement {
133-
node: graphene_std::text_nodes::string_replace::IDENTIFIER,
134-
aliases: &["graphene_core::logic::StringReplaceNode", "graphene_core::text::StringReplaceNode"],
135-
},
136-
NodeReplacement {
137-
node: graphene_std::text_nodes::string_slice::IDENTIFIER,
138-
aliases: &["graphene_core::logic::StringSliceNode", "graphene_core::text::StringSliceNode"],
139-
},
140-
NodeReplacement {
141-
node: graphene_std::text_nodes::string_split::IDENTIFIER,
142-
aliases: &["graphene_core::logic::StringSplitNode", "graphene_core::text::StringSplitNode"],
143-
},
144-
NodeReplacement {
145-
node: graphene_std::math_nodes::switch::IDENTIFIER,
146-
aliases: &["graphene_core::logic::SwitchNode"],
147-
},
148-
NodeReplacement {
149-
node: graphene_std::text_nodes::to_string::IDENTIFIER,
150-
aliases: &["graphene_core::logic::ToStringNode", "graphene_core::text::ToStringNode"],
151-
},
152-
NodeReplacement {
153-
node: graphene_std::text_nodes::json_get::IDENTIFIER,
154-
aliases: &["graphene_core::logic::JsonGetNode", "graphene_core::text::JsonGetNode"],
155-
},
156120
NodeReplacement {
157121
node: graphene_std::debug::unwrap_option::IDENTIFIER,
158122
aliases: &["graphene_core::ops::UnwrapNode", "graphene_core::debug::UnwrapNode"],
@@ -421,10 +385,6 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
421385
node: graphene_std::math_nodes::sine_inverse::IDENTIFIER,
422386
aliases: &["graphene_math_nodes::SineInverseNode", "graphene_core::ops::SineInverseNode"],
423387
},
424-
NodeReplacement {
425-
node: graphene_std::text_nodes::string_value::IDENTIFIER,
426-
aliases: &["graphene_math_nodes::StringValueNode", "graphene_core::ops::StringValueNode", "math_nodes::StringValueNode"],
427-
},
428388
NodeReplacement {
429389
node: graphene_std::math_nodes::subtract::IDENTIFIER,
430390
aliases: &["graphene_math_nodes::SubtractNode", "graphene_core::ops::SubtractNode"],
@@ -684,6 +644,46 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
684644
node: graphene_std::text::text::IDENTIFIER,
685645
aliases: &["graphene_core::text::text::TextNode", "graphene_core::text::TextGeneratorNode", "graphene_core::text::TextNode"],
686646
},
647+
NodeReplacement {
648+
node: graphene_std::text_nodes::string_value::IDENTIFIER,
649+
aliases: &["graphene_math_nodes::StringValueNode", "graphene_core::ops::StringValueNode", "math_nodes::StringValueNode"],
650+
},
651+
NodeReplacement {
652+
node: graphene_std::text_nodes::string_concatenate::IDENTIFIER,
653+
aliases: &["graphene_core::logic::StringConcatenateNode"],
654+
},
655+
NodeReplacement {
656+
node: graphene_std::text_nodes::string_length::IDENTIFIER,
657+
aliases: &["graphene_core::logic::StringLengthNode"],
658+
},
659+
NodeReplacement {
660+
node: graphene_std::text_nodes::string_replace::IDENTIFIER,
661+
aliases: &["graphene_core::logic::StringReplaceNode"],
662+
},
663+
NodeReplacement {
664+
node: graphene_std::text_nodes::string_slice::IDENTIFIER,
665+
aliases: &["graphene_core::logic::StringSliceNode"],
666+
},
667+
NodeReplacement {
668+
node: graphene_std::text_nodes::string_split::IDENTIFIER,
669+
aliases: &["graphene_core::logic::StringSplitNode"],
670+
},
671+
NodeReplacement {
672+
node: graphene_std::math_nodes::switch::IDENTIFIER,
673+
aliases: &["graphene_core::logic::SwitchNode"],
674+
},
675+
NodeReplacement {
676+
node: graphene_std::text_nodes::to_string::IDENTIFIER,
677+
aliases: &["graphene_core::logic::ToStringNode"],
678+
},
679+
NodeReplacement {
680+
node: graphene_std::text_nodes::json_get::IDENTIFIER,
681+
aliases: &["graphene_core::logic::JsonGetNode"],
682+
},
683+
NodeReplacement {
684+
node: graphene_std::text_nodes::serialize::IDENTIFIER,
685+
aliases: &["graphene_core::logic::SerializeNode"],
686+
},
687687
// ================================
688688
// transform
689689
// ================================

node-graph/nodes/gcore/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pub mod debug;
55
pub mod extract_xy;
66
pub mod memo;
77
pub mod ops;
8+
89
// Re-export all nodes
910
pub use animation::*;
1011
pub use context::*;

node-graph/nodes/text/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ fn to_string(_: impl Ctx, value: String) -> String {
153153
/// Joins two strings together.
154154
#[node_macro::node(category("Text"))]
155155
fn string_concatenate(_: impl Ctx, #[implementations(String)] first: String, second: TextArea) -> String {
156-
first.clone() + &second
156+
first + &second
157157
}
158158

159159
/// Replaces all occurrences of "From" with "To" in the input string.

0 commit comments

Comments
 (0)