Update derive_more

slint-ui · Sep 26, 2024 · 8ac0c79 · 8ac0c79
1 parent a9aa8bc
commit 8ac0c79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -137,7 +137,7 @@ cfg_aliases = { version = "0.2.0" }
 clap = { version = "4.0", features = ["derive", "wrap_help"] }
 clru = { version = "0.6.0" }
 css-color-parser2 = { version = "1.0.1" }
-derive_more = { version = "0.99.17" }
+derive_more = { version = "1.0.0", default-features = false, features = ["deref", "deref_mut", "into", "from", "add", "add_assign", "mul", "not", "display"] }
 euclid = { version = "0.22.1", default-features = false }
 fontdb = { version = "0.18.0", default-features = false }
 fontdue = { version = "0.9.0" }

diff --git a/internal/compiler/generator/rust.rs b/internal/compiler/generator/rust.rs
@@ -2139,10 +2139,9 @@ fn compile_expression(expr: &Expression, ctx: &EvaluationContext) -> TokenStream
                         Expression::Array { element_ty: _, values, as_model: _ } => values
                             .iter()
                             .map(|path_elem_expr|
-                                // Close{} is a struct with no fields in markup, and PathElement::Close has no fields, so map to an empty token stream
-                                // and thus later just unit type, which can convert into PathElement::Close.
+                                // Close{} is a struct with no fields in markup, and PathElement::Close has no fields
                                 if matches!(path_elem_expr, Expression::Struct { ty: Type::Struct { fields, .. }, .. } if fields.is_empty()) {
-                                    ::core::default::Default::default()
+                                    quote!(sp::PathElement::Close)
                                 } else {
                                     compile_expression(path_elem_expr, ctx)
                                 }

diff --git a/internal/compiler/parser.rs b/internal/compiler/parser.rs
@@ -236,9 +236,8 @@ macro_rules! declare_syntax {
 
         pub mod syntax_nodes {
             use super::*;
-            use derive_more::*;
             $(
-                #[derive(Debug, Clone, Deref, Into)]
+                #[derive(Debug, Clone, derive_more::Deref, derive_more::Into)]
                 pub struct $nodekind(SyntaxNode);
                 #[cfg(test)]
                 impl SyntaxNodeVerify for $nodekind {