chore: update attribute-derive (#2438)

leptos-rs · Mar 18, 2024 · 4e578e3 · 4e578e3
1 parent 97fd8ff
commit 4e578e3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/leptos_macro/Cargo.toml b/leptos_macro/Cargo.toml
@@ -13,7 +13,7 @@ rust-version.workspace = true
 proc-macro = true
 
 [dependencies]
-attribute-derive = { version = "0.8", features = ["syn-full"] }
+attribute-derive = { version = "0.9", features = ["syn-full"]}
 cfg-if = "1"
 html-escape = "0.2"
 itertools = "0.12"

diff --git a/leptos_macro/src/component.rs b/leptos_macro/src/component.rs
@@ -1,4 +1,4 @@
-use attribute_derive::Attribute as AttributeDerive;
+use attribute_derive::FromAttr;
 use convert_case::{
     Case::{Pascal, Snake},
     Casing,
@@ -808,7 +808,7 @@ impl Docs {
     }
 }
 
-#[derive(Clone, Debug, AttributeDerive)]
+#[derive(Clone, Debug, FromAttr)]
 #[attribute(ident = prop)]
 struct PropOpt {
     #[attribute(conflicts = [optional_no_strip, strip_option])]

diff --git a/leptos_macro/src/slot.rs b/leptos_macro/src/slot.rs
@@ -1,7 +1,7 @@
 use crate::component::{
     convert_from_snake_case, drain_filter, is_option, unwrap_option, Docs,
 };
-use attribute_derive::Attribute as AttributeDerive;
+use attribute_derive::FromAttr;
 use proc_macro2::{Ident, TokenStream};
 use quote::{quote, ToTokens, TokenStreamExt};
 use syn::{
@@ -179,7 +179,7 @@ impl Prop {
     }
 }
 
-#[derive(Clone, Debug, AttributeDerive)]
+#[derive(Clone, Debug, FromAttr)]
 #[attribute(ident = prop)]
 struct PropOpt {
     #[attribute(conflicts = [optional_no_strip, strip_option])]

diff --git a/leptos_macro/tests/ui/component.stderr b/leptos_macro/tests/ui/component.stderr
@@ -38,15 +38,17 @@ error: `optional_no_strip` conflicts with mutually exclusive `strip_option`
 30 |     #[prop(optional_no_strip, strip_option)] conflicting: bool,
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: unexpected end of input, expected assignment `=`
+error: unexpected end of input, expected `=` or `(`
+
+       = help: try `#[prop(default = 5 * 10)]`
   --> tests/ui/component.rs:36:40
    |
 36 | fn default_without_value(#[prop(default)] default: bool) -> impl IntoView {
    |                                        ^
 
 error: unexpected end of input, expected one of: identifier, `::`, `<`, `_`, literal, `const`, `ref`, `mut`, `&`, parentheses, square brackets, `..`, `const`
 
-       = help: try `#[prop(default=5 * 10)]`
+       = help: try `#[prop(default = 5 * 10)]`
   --> tests/ui/component.rs:42:22
    |
 42 |     #[prop(default= |)] default: bool,

diff --git a/leptos_macro/tests/ui/component_absolute.stderr b/leptos_macro/tests/ui/component_absolute.stderr
@@ -30,15 +30,17 @@ error: `optional_no_strip` conflicts with mutually exclusive `strip_option`
 25 |     #[prop(optional_no_strip, strip_option)] conflicting: bool,
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: unexpected end of input, expected assignment `=`
+error: unexpected end of input, expected `=` or `(`
+
+       = help: try `#[prop(default = 5 * 10)]`
   --> tests/ui/component_absolute.rs:32:19
    |
 32 |     #[prop(default)] default: bool,
    |                   ^
 
 error: unexpected end of input, expected one of: identifier, `::`, `<`, `_`, literal, `const`, `ref`, `mut`, `&`, parentheses, square brackets, `..`, `const`
 
-       = help: try `#[prop(default=5 * 10)]`
+       = help: try `#[prop(default = 5 * 10)]`
   --> tests/ui/component_absolute.rs:39:22
    |
 39 |     #[prop(default= |)] default: bool,