-
+
@@ -99,7 +99,7 @@ impl Post {
fn render_section_hero(&self, section: &content::Section) -> Html {
html! {
- 
+ )
for VComp {
- fn transform(from: AppRoute) -> PublicUrlSwitch {
- from.into_public()
+impl IntoPropValue for AppRoute {
+ fn into_prop_value(self: AppRoute) -> PublicUrlSwitch {
+ self.into_public()
}
}
diff --git a/examples/store/src/post.rs b/examples/store/src/post.rs
index 398b825a81d..2b8f2d02282 100644
--- a/examples/store/src/post.rs
+++ b/examples/store/src/post.rs
@@ -71,7 +71,7 @@ impl Component for Post {
{
}
}
-impl Into for BoxedVNodeProducer {
- fn into(self) -> VNode {
- self.build()
+impl From> for VNode {
+ fn from(value: BoxedVNodeProducer) -> VNode {
+ value.build()
}
}
diff --git a/packages/yew-functional-macro/Makefile.toml b/packages/yew-functional-macro/Makefile.toml
index 2df620e7c5d..a6e497471e1 100644
--- a/packages/yew-functional-macro/Makefile.toml
+++ b/packages/yew-functional-macro/Makefile.toml
@@ -1,6 +1,6 @@
[tasks.test]
clear = true
-toolchain = "1.45.2"
+toolchain = "1.51"
command = "cargo"
args = ["test"]
diff --git a/packages/yew-functional-macro/tests/function_attr/bad-return-type-fail.stderr b/packages/yew-functional-macro/tests/function_attr/bad-return-type-fail.stderr
index b25fe5a3eef..283e09594dc 100644
--- a/packages/yew-functional-macro/tests/function_attr/bad-return-type-fail.stderr
+++ b/packages/yew-functional-macro/tests/function_attr/bad-return-type-fail.stderr
@@ -8,6 +8,6 @@ error[E0308]: mismatched types
--> $DIR/bad-return-type-fail.rs:14:5
|
13 | fn comp(_props: &Props) -> u32 {
- | --- expected `yew::virtual_dom::vnode::VNode` because of return type
+ | --- expected `VNode` because of return type
14 | 1
- | ^ expected enum `yew::virtual_dom::vnode::VNode`, found integer
+ | ^ expected enum `VNode`, found integer
diff --git a/packages/yew-functional-macro/tests/function_attr_test.rs b/packages/yew-functional-macro/tests/function_attr_test.rs
index 34c7e9db899..9747bc8d82f 100644
--- a/packages/yew-functional-macro/tests/function_attr_test.rs
+++ b/packages/yew-functional-macro/tests/function_attr_test.rs
@@ -1,5 +1,5 @@
#[allow(dead_code)]
-#[rustversion::attr(stable(1.45), test)]
+#[rustversion::attr(stable(1.51), test)]
fn tests() {
let t = trybuild::TestCases::new();
t.pass("tests/function_attr/*-pass.rs");
diff --git a/packages/yew-functional/src/hooks/use_ref.rs b/packages/yew-functional/src/hooks/use_ref.rs
index ca6e0f18702..ce4964c644d 100644
--- a/packages/yew-functional/src/hooks/use_ref.rs
+++ b/packages/yew-functional/src/hooks/use_ref.rs
@@ -40,7 +40,7 @@ use std::rc::Rc;
///
/// html! {
/// ();
- Some(tokens)
- };
-
- let push_classes = match classes {
- Some(ClassesForm::Tuple(classes)) => {
- let span = classes.span();
- let classes: Vec<_> = classes.elems.iter().collect();
- let n = classes.len();
- let sr = stringify::stringify_at_runtime(quote! { __yew_classes });
-
- let deprecation_warning = quote_spanned! {span=>
- #[deprecated(
- note = "the use of `(...)` with the attribute `class` is deprecated and will be removed in version 0.19. Use the `classes!` macro instead."
- )]
- fn deprecated_use_of_class() {}
-
- if false {
- deprecated_use_of_class();
};
- };
- Some(quote! {
- let mut __yew_classes = ::yew::html::Classes::with_capacity(#n);
- #(__yew_classes.push(#classes);)*
+ Some(quote! {
+ {
+ let mut __yew_classes = ::yew::html::Classes::with_capacity(#n);
+ #(__yew_classes.push(#classes);)*
- #deprecation_warning
+ #deprecation_warning
- if !__yew_classes.is_empty() {
- #vtag.__macro_push_attribute("class", #sr);
- } else {
- #vtag.__macro_push_attribute_placeholder("class");
- };
- })
- }
- Some(ClassesForm::Single(classes)) => match classes.try_into_lit() {
- Some(lit) => {
- if lit.value().is_empty() {
- None
- } else {
- let sr = lit.stringify();
- Some(quote! {
- #vtag.__macro_push_attribute("class", #sr);
- })
- }
+ ::yew::virtual_dom::PositionalAttr::new("class", __yew_classes)
+ }
+ })
}
- None => {
- let sr = stringify::stringify_at_runtime(quote! { __yew_classes });
- Some(quote! {
- let __yew_classes = ::std::convert::Into::<::yew::html::Classes>::into(#classes);
- if !__yew_classes.is_empty() {
- #vtag.__macro_push_attribute("class", #sr);
+ ClassesForm::Single(classes) => match classes.try_into_lit() {
+ Some(lit) => {
+ if lit.value().is_empty() {
+ None
} else {
- #vtag.__macro_push_attribute_placeholder("class");
- };
- })
+ let sr = lit.stringify();
+ Some(quote! { ::yew::virtual_dom::PositionalAttr::new("class", #sr) })
+ }
+ }
+ None => {
+ Some(quote! { ::yew::virtual_dom::PositionalAttr::new("class", ::std::convert::Into::<::yew::html::Classes>::into(#classes)) })
+ }
}
- },
- None => None,
+ });
+
+ let attrs = normal_attrs.chain(boolean_attrs).chain(class_attr);
+ quote! {
+ #vtag.attributes = ::yew::virtual_dom::Attributes::Vec(::std::vec![#(#attrs),*]);
+ }
};
- let add_listeners = if listeners.is_empty() {
+ let set_listeners = if listeners.is_empty() {
None
- } else if listeners.iter().any(|attr| attr.question_mark.is_some()) {
- let add_listeners = listeners
- .iter()
- .map(
- |Prop {
- label,
- question_mark,
- value,
- ..
- }| {
- let name = &label.name;
-
- if question_mark.is_some() {
- let ident = Ident::new("__yew_listener", name.span());
- let listener = to_wrapped_listener(name, &ident);
- quote_spanned! {value.span()=>
- let #ident = ::std::option::Option::map(#value, |#ident| {
- #listener
- });
- if let ::std::option::Option::Some(#ident) = #ident {
- #vtag.add_listener(#ident);
- };
- }
- } else {
- let listener = to_wrapped_listener(name, value);
- quote_spanned! {value.span()=>
- #vtag.add_listener(#listener);
- }
- }
- },
- )
- .collect();
-
- Some(add_listeners)
} else {
- let listeners_it = listeners
- .iter()
- .map(|Prop { label, value, .. }| to_wrapped_listener(&label.name, value));
+ let listeners_it = listeners.iter().map(|Prop { label, value, .. }| {
+ let name = &label.name;
+ quote! {
+ ::yew::html::#name::Wrapper::__macro_new(#value)
+ }
+ });
Some(quote! {
- #vtag.add_listeners(::std::vec![#(#listeners_it),*]);
+ #vtag.__macro_set_listeners(::std::vec![#(#listeners_it),*]);
})
};
@@ -349,7 +257,6 @@ impl ToTokens for HtmlElement {
let dyn_tag_runtime_checks = if matches!(&name, TagName::Expr(_)) {
// when Span::source_file Span::start get stabilised or yew-macro introduces a nightly feature flag
// we should expand the panic message to contain the exact location of the dynamic tag.
- let sr = stringify::stringify_at_runtime(quote! { __yew_v });
Some(quote! {
// check void element
if !#vtag.children.is_empty() {
@@ -366,11 +273,8 @@ impl ToTokens for HtmlElement {
match #vtag.tag() {
"input" | "textarea" => {}
_ => {
- if let ::std::option::Option::Some(__yew_v) = #vtag.value.take() {
- #vtag.__macro_push_attribute("value", #sr);
- } else {
- #vtag.__macro_push_attribute_placeholder("value");
- };
+ let __yew_v = #vtag.value.take();
+ #vtag.__macro_push_attr(::yew::virtual_dom::PositionalAttr::new("value", __yew_v));
}
}
})
@@ -388,30 +292,18 @@ impl ToTokens for HtmlElement {
#set_value
#set_kind
#set_checked
-
#set_attributes
- #push_booleans
- #push_classes
+ #set_listeners
- #add_listeners
#add_children
#dyn_tag_runtime_checks
- #[allow(unused_braces)]
::yew::virtual_dom::VNode::from(#vtag)
}
});
}
}
-fn to_wrapped_listener(name: &Ident, value: impl ToTokens) -> TokenStream {
- quote_spanned! {value.span()=>
- ::std::rc::Rc::new(::yew::html::#name::Wrapper::new(
- <::yew::virtual_dom::VTag as ::yew::virtual_dom::Transformer<_, _>>::transform(#value),
- ))
- }
-}
-
struct DynamicName {
at: Token![@],
expr: Option,
diff --git a/packages/yew-macro/src/html_tree/html_list.rs b/packages/yew-macro/src/html_tree/html_list.rs
index c66c6919abb..a9a75ce93f0 100644
--- a/packages/yew-macro/src/html_tree/html_list.rs
+++ b/packages/yew-macro/src/html_tree/html_list.rs
@@ -64,9 +64,9 @@ impl ToTokens for HtmlList {
} = &self;
let key = if let Some(key) = &open.props.key {
- quote_spanned! {key.span()=> Some(::std::convert::Into::<::yew::virtual_dom::Key>::into(#key))}
+ quote_spanned! {key.span()=> ::std::option::Option::Some(::std::convert::Into::<::yew::virtual_dom::Key>::into(#key))}
} else {
- quote! {None}
+ quote! { ::std::option::Option::None }
};
let spanned = {
@@ -137,8 +137,6 @@ impl Parse for HtmlListProps {
));
}
- prop.ensure_not_optional()?;
-
Some(prop.value)
};
diff --git a/packages/yew-macro/src/props/component.rs b/packages/yew-macro/src/props/component.rs
index 48086790ede..a322507ba5d 100644
--- a/packages/yew-macro/src/props/component.rs
+++ b/packages/yew-macro/src/props/component.rs
@@ -132,13 +132,10 @@ impl ComponentProps {
let build_props = match self {
Self::List(props) => {
let set_props = props.iter().map(|Prop { label, value, .. }| {
- quote_spanned! {value.span()=> .#label(
- #[allow(unused_braces)]
- <::yew::virtual_dom::VComp as ::yew::virtual_dom::Transformer<_, _>>::transform(
- #value
- )
- )}
- });
+ quote_spanned! {value.span()=>
+ .#label(#value)
+ }
+ });
let set_children = if let Some(children) = children_renderer {
Some(quote_spanned! {props_ty.span()=>
@@ -198,12 +195,7 @@ impl TryFrom for ComponentProps {
fn try_from(props: Props) -> Result {
props.check_no_duplicates()?;
props.check_all(|prop| {
- if prop.question_mark.is_some() {
- Err(syn::Error::new_spanned(
- &prop.label,
- "optional attributes are only supported on elements. Components can use `Option` properties to accomplish the same thing.",
- ))
- } else if !prop.label.extended.is_empty() {
+ if !prop.label.extended.is_empty() {
Err(syn::Error::new_spanned(
&prop.label,
"expected a valid Rust identifier",
diff --git a/packages/yew-macro/src/props/element.rs b/packages/yew-macro/src/props/element.rs
index d1471e186fd..5d788500996 100644
--- a/packages/yew-macro/src/props/element.rs
+++ b/packages/yew-macro/src/props/element.rs
@@ -56,23 +56,13 @@ impl Parse for ElementProps {
let booleans =
props.drain_filter(|prop| BOOLEAN_SET.contains(prop.label.to_string().as_str()));
- booleans.check_all(|prop| {
- if prop.question_mark.is_some() {
- Err(syn::Error::new_spanned(
- &prop.label,
- "boolean attributes don't support being used as an optional attribute (hint: a value of false results in the attribute not being set)"
- ))
- } else {
- Ok(())
- }
- })?;
let classes = props
- .pop_nonoptional("class")?
+ .pop("class")
.map(|prop| ClassesForm::from_expr(prop.value));
let value = props.pop("value");
let kind = props.pop("type");
- let checked = props.pop_nonoptional("checked")?;
+ let checked = props.pop("checked");
let SpecialProps { node_ref, key } = props.special;
diff --git a/packages/yew-macro/src/props/prop.rs b/packages/yew-macro/src/props/prop.rs
index 0036e6c6838..716dd2e0488 100644
--- a/packages/yew-macro/src/props/prop.rs
+++ b/packages/yew-macro/src/props/prop.rs
@@ -1,6 +1,6 @@
use crate::html_tree::HtmlDashedName;
use proc_macro2::TokenStream;
-use quote::{quote, ToTokens};
+use quote::ToTokens;
use std::{
cmp::Ordering,
convert::TryFrom,
@@ -26,40 +26,13 @@ impl ToTokens for PropPunct {
pub struct Prop {
pub label: HtmlDashedName,
- pub question_mark: Option,
/// Punctuation between `label` and `value`.
pub punct: Option,
pub value: Expr,
}
-impl Prop {
- /// Checks if the prop uses the optional attribute syntax.
- /// If it does, an error is returned.
- pub fn ensure_not_optional(&self) -> syn::Result<()> {
- let Self {
- label,
- question_mark,
- punct,
- ..
- } = self;
- if question_mark.is_some() {
- let msg = format!(
- "`{}` does not support being used as an optional attribute",
- label
- );
- // include `?=` in the span
- Err(syn::Error::new_spanned(
- quote! { #label#question_mark#punct },
- msg,
- ))
- } else {
- Ok(())
- }
- }
-}
impl Parse for Prop {
fn parse(input: ParseStream) -> syn::Result {
let label = input.parse::()?;
- let question_mark = input.parse::().ok();
let equals = input.parse::().map_err(|_| {
syn::Error::new_spanned(
&label,
@@ -75,7 +48,6 @@ impl Parse for Prop {
let value = input.parse::()?;
Ok(Self {
label,
- question_mark,
punct: Some(PropPunct::Eq(equals)),
value,
})
@@ -141,16 +113,6 @@ impl SortedPropList {
Ok(prop)
}
- /// Pop the prop with the given key and error if it uses the optional attribute syntax.
- pub fn pop_nonoptional(&mut self, key: &str) -> syn::Result> {
- match self.pop_unique(key) {
- Ok(Some(prop)) => {
- prop.ensure_not_optional()?;
- Ok(Some(prop))
- }
- res => res,
- }
- }
/// Turn the props into a vector of `Prop`.
pub fn into_vec(self) -> Vec {
@@ -224,8 +186,8 @@ impl SpecialProps {
const KEY_LABEL: &'static str = "key";
fn pop_from(props: &mut SortedPropList) -> syn::Result {
- let node_ref = props.pop_nonoptional(Self::REF_LABEL)?;
- let key = props.pop_nonoptional(Self::KEY_LABEL)?;
+ let node_ref = props.pop_unique(Self::REF_LABEL)?;
+ let key = props.pop_unique(Self::KEY_LABEL)?;
Ok(Self { node_ref, key })
}
diff --git a/packages/yew-macro/src/props/prop_macro.rs b/packages/yew-macro/src/props/prop_macro.rs
index 878b548b41c..e1145b8ace2 100644
--- a/packages/yew-macro/src/props/prop_macro.rs
+++ b/packages/yew-macro/src/props/prop_macro.rs
@@ -64,16 +64,15 @@ impl Parse for PropValue {
}
}
-impl Into for PropValue {
- fn into(self) -> Prop {
- let Self {
+impl From for Prop {
+ fn from(prop_value: PropValue) -> Prop {
+ let PropValue {
label,
colon_token,
value,
- } = self;
+ } = prop_value;
Prop {
label,
- question_mark: None,
punct: colon_token.map(PropPunct::Colon),
value,
}
diff --git a/packages/yew-macro/src/stringify.rs b/packages/yew-macro/src/stringify.rs
index 6fe6a3bf19a..291d9147b9b 100644
--- a/packages/yew-macro/src/stringify.rs
+++ b/packages/yew-macro/src/stringify.rs
@@ -1,25 +1,12 @@
use proc_macro2::TokenStream;
-use quote::{quote, quote_spanned, ToTokens};
+use quote::{quote_spanned, ToTokens};
use syn::spanned::Spanned;
-use syn::{Expr, Ident, Lit, LitStr};
+use syn::{Expr, Lit, LitStr};
/// Stringify a value at runtime.
-pub fn stringify_at_runtime(src: impl ToTokens) -> TokenStream {
+fn stringify_at_runtime(src: impl ToTokens) -> TokenStream {
quote_spanned! {src.span()=>
- ::std::borrow::Cow::<'static, str>::Owned(
- ::std::string::ToString::to_string(&(#src)),
- )
- }
-}
-
-/// Map an `Option` type such that it turns into `Cow<'static, str>`.
-pub fn stringify_option_at_runtime(src: impl ToTokens) -> TokenStream {
- let ident = Ident::new("__yew_str", src.span());
- let sr = stringify_at_runtime(&ident);
- quote! {
- ::std::option::Option::map(#src, |#ident| {
- #sr
- })
+ ::std::convert::Into::<::std::borrow::Cow::<'static, str>>::into(#src)
}
}
@@ -31,6 +18,18 @@ pub trait Stringify {
fn try_into_lit(&self) -> Option;
/// Create `Cow<'static, str>` however possible.
fn stringify(&self) -> TokenStream;
+
+ /// Optimize literals to `&'static str`, otherwise keep the value as is.
+ fn optimize_literals(&self) -> TokenStream
+ where
+ Self: ToTokens,
+ {
+ if let Some(lit) = self.try_into_lit() {
+ lit.to_token_stream()
+ } else {
+ self.to_token_stream()
+ }
+ }
}
impl Stringify for &T {
fn try_into_lit(&self) -> Option {
@@ -56,12 +55,11 @@ impl Stringify for LitStr {
impl Stringify for Lit {
fn try_into_lit(&self) -> Option {
let s = match self {
- Lit::Str(v) => v.value(),
+ Lit::Str(v) => return v.try_into_lit(),
Lit::Char(v) => v.value().to_string(),
Lit::Int(v) => v.base10_digits().to_string(),
Lit::Float(v) => v.base10_digits().to_string(),
- Lit::Bool(v) => v.value.to_string(),
- _ => return None,
+ Lit::Bool(_) | Lit::ByteStr(_) | Lit::Byte(_) | Lit::Verbatim(_) => return None,
};
Some(LitStr::new(&s, self.span()))
}
diff --git a/packages/yew-macro/tests/classes_macro/classes-fail.stderr b/packages/yew-macro/tests/classes_macro/classes-fail.stderr
index 06ad2357591..df4ac0aac3a 100644
--- a/packages/yew-macro/tests/classes_macro/classes-fail.stderr
+++ b/packages/yew-macro/tests/classes_macro/classes-fail.stderr
@@ -10,92 +10,95 @@ error: string literals must not contain more than one class (hint: use `"two", "
18 | classes!("one", "two three", "four");
| ^^^^^^^^^^^
-error[E0277]: the trait bound `yew::html::classes::Classes: std::convert::From<{integer}>` is not satisfied
+error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
--> $DIR/classes-fail.rs:4:14
|
4 | classes!(42);
- | ^^ the trait `std::convert::From<{integer}>` is not implemented for `yew::html::classes::Classes`
+ | ^^ the trait `From<{integer}>` is not implemented for `Classes`
|
= help: the following implementations were found:
- >
- >
- >>
- >
+ >
+ >>
+ >
+ >
and 4 others
- = note: required because of the requirements on the impl of `std::convert::Into` for `{integer}`
+ = note: required because of the requirements on the impl of `Into` for `{integer}`
-error[E0277]: the trait bound `yew::html::classes::Classes: std::convert::From<{float}>` is not satisfied
+error[E0277]: the trait bound `Classes: From<{float}>` is not satisfied
--> $DIR/classes-fail.rs:5:14
|
5 | classes!(42.0);
- | ^^^^ the trait `std::convert::From<{float}>` is not implemented for `yew::html::classes::Classes`
+ | ^^^^ the trait `From<{float}>` is not implemented for `Classes`
|
= help: the following implementations were found:
- >
- >
- >>
- >
+ >
+ >>
+ >
+ >
and 4 others
- = note: required because of the requirements on the impl of `std::convert::Into` for `{float}`
+ = note: required because of the requirements on the impl of `Into` for `{float}`
-error[E0277]: the trait bound `yew::html::classes::Classes: std::convert::From<{integer}>` is not satisfied
+error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
--> $DIR/classes-fail.rs:9:14
|
9 | classes!(vec![42]);
- | ^^^ the trait `std::convert::From<{integer}>` is not implemented for `yew::html::classes::Classes`
+ | ^^^ the trait `From<{integer}>` is not implemented for `Classes`
|
= help: the following implementations were found:
- >
- >
- >>
- >
+ >
+ >>
+ >
+ >
and 4 others
- = note: required because of the requirements on the impl of `std::convert::Into` for `{integer}`
- = note: required because of the requirements on the impl of `std::convert::From>` for `yew::html::classes::Classes`
- = note: required because of the requirements on the impl of `std::convert::Into` for `std::vec::Vec<{integer}>`
+ = note: required because of the requirements on the impl of `Into` for `{integer}`
+ = note: required because of the requirements on the impl of `From>` for `Classes`
+ = note: 1 redundant requirements hidden
+ = note: required because of the requirements on the impl of `Into` for `std::vec::Vec<{integer}>`
-error[E0277]: the trait bound `yew::html::classes::Classes: std::convert::From<{integer}>` is not satisfied
+error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
--> $DIR/classes-fail.rs:13:14
|
13 | classes!(some);
- | ^^^^ the trait `std::convert::From<{integer}>` is not implemented for `yew::html::classes::Classes`
+ | ^^^^ the trait `From<{integer}>` is not implemented for `Classes`
|
= help: the following implementations were found:
- >
- >
- >>
- >
+ >
+ >>
+ >
+ >
and 4 others
- = note: required because of the requirements on the impl of `std::convert::Into` for `{integer}`
- = note: required because of the requirements on the impl of `std::convert::From>` for `yew::html::classes::Classes`
- = note: required because of the requirements on the impl of `std::convert::Into` for `std::option::Option<{integer}>`
+ = note: required because of the requirements on the impl of `Into` for `{integer}`
+ = note: required because of the requirements on the impl of `From>` for `Classes`
+ = note: 1 redundant requirements hidden
+ = note: required because of the requirements on the impl of `Into` for `Option<{integer}>`
-error[E0277]: the trait bound `yew::html::classes::Classes: std::convert::From` is not satisfied
+error[E0277]: the trait bound `Classes: From` is not satisfied
--> $DIR/classes-fail.rs:14:14
|
14 | classes!(none);
- | ^^^^ the trait `std::convert::From` is not implemented for `yew::html::classes::Classes`
+ | ^^^^ the trait `From` is not implemented for `Classes`
|
= help: the following implementations were found:
- >
- >
- >>
- >
+ >
+ >>
+ >
+ >
and 4 others
- = note: required because of the requirements on the impl of `std::convert::Into` for `u32`
- = note: required because of the requirements on the impl of `std::convert::From>` for `yew::html::classes::Classes`
- = note: required because of the requirements on the impl of `std::convert::Into` for `std::option::Option`
+ = note: required because of the requirements on the impl of `Into` for `u32`
+ = note: required because of the requirements on the impl of `From>` for `Classes`
+ = note: 1 redundant requirements hidden
+ = note: required because of the requirements on the impl of `Into` for `Option`
-error[E0277]: the trait bound `yew::html::classes::Classes: std::convert::From<{integer}>` is not satisfied
+error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
--> $DIR/classes-fail.rs:16:21
|
16 | classes!("one", 42);
- | ^^ the trait `std::convert::From<{integer}>` is not implemented for `yew::html::classes::Classes`
+ | ^^ the trait `From<{integer}>` is not implemented for `Classes`
|
= help: the following implementations were found:
- >
- >
- >>
- >
+ >
+ >>
+ >
+ >
and 4 others
- = note: required because of the requirements on the impl of `std::convert::Into` for `{integer}`
+ = note: required because of the requirements on the impl of `Into` for `{integer}`
diff --git a/packages/yew-macro/tests/classes_macro_test.rs b/packages/yew-macro/tests/classes_macro_test.rs
index 9a340d66fa0..ededbf6e042 100644
--- a/packages/yew-macro/tests/classes_macro_test.rs
+++ b/packages/yew-macro/tests/classes_macro_test.rs
@@ -1,5 +1,5 @@
#[allow(dead_code)]
-#[rustversion::attr(stable(1.45), test)]
+#[rustversion::attr(stable(1.51), test)]
fn classes_macro() {
let t = trybuild::TestCases::new();
t.pass("tests/classes_macro/*-pass.rs");
diff --git a/packages/yew-macro/tests/derive_props/fail.stderr b/packages/yew-macro/tests/derive_props/fail.stderr
index a30738f24f3..8bcb3a680a1 100644
--- a/packages/yew-macro/tests/derive_props/fail.stderr
+++ b/packages/yew-macro/tests/derive_props/fail.stderr
@@ -9,6 +9,10 @@ error: cannot find attribute `props` in this scope
|
22 | #[props(default)]
| ^^^^^
+ |
+ = note: consider importing one of these items:
+ yew::props
+ yew_macro::props
error[E0425]: cannot find value `foo` in this scope
--> $DIR/fail.rs:87:24
@@ -29,7 +33,7 @@ error[E0277]: the trait bound `t1::Value: std::default::Default` is not satisfie
9 | #[derive(Clone, Properties)]
| ^^^^^^^^^^ the trait `std::default::Default` is not implemented for `t1::Value`
|
- = note: required by `std::default::Default::default`
+ = note: required by `Option::::unwrap_or_default`
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0599]: no method named `build` found for struct `t3::PropsBuilder` in the current scope
@@ -40,12 +44,8 @@ error[E0599]: no method named `build` found for struct `t3::PropsBuilder`
- |
- = help: items from traits can only be used if the trait is implemented and in scope
- = note: the following trait defines an item `build`, perhaps you need to implement it:
- candidate #1: `proc_macro::bridge::server::TokenStreamBuilder`
-error[E0599]: no method named `b` found for struct `t4::PropsBuilder` in the current scope
+error[E0599]: no method named `b` found for struct `t4::PropsBuilder` in the current scope
--> $DIR/fail.rs:48:26
|
41 | #[derive(Clone, Properties)]
@@ -58,33 +58,37 @@ error[E0308]: mismatched types
--> $DIR/fail.rs:67:19
|
67 | #[prop_or(123)]
- | ^^^
- | |
- | expected struct `std::string::String`, found integer
- | help: try using a conversion method: `123.to_string()`
-
-error[E0618]: expected function, found `{integer}`
- --> $DIR/fail.rs:77:24
+ | ^^^ expected struct `String`, found integer
|
-77 | #[prop_or_else(123)]
- | ^^^ call expression requires function
+help: try using a conversion method
+ |
+67 | #[prop_or(123.to_string())]
+ | ^^^^^^^^^^^^^^^
+67 | #[prop_or(123.to_string())]
+ | ^^^^^^^^^^^^^^^
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0277]: expected a `FnOnce<()>` closure, found `{integer}`
+ --> $DIR/fail.rs:77:24
+ |
+77 | #[prop_or_else(123)]
+ | ^^^ expected an `FnOnce<()>` closure, found `{integer}`
+ |
+ = help: the trait `FnOnce<()>` is not implemented for `{integer}`
+ = note: wrap the `{integer}` in a closure with no arguments: `|| { /* code */ }`
+
+error[E0593]: function is expected to take 0 arguments, but it takes 1 argument
--> $DIR/fail.rs:97:24
|
97 | #[prop_or_else(foo)]
- | ^^^- supplied 0 arguments
- | |
- | expected 1 argument
+ | ^^^ expected function that takes 0 arguments
...
101 | fn foo(bar: i32) -> String {
- | -------------------------- defined here
+ | -------------------------- takes 1 argument
-error[E0308]: mismatched types
+error[E0271]: type mismatch resolving ` i32 {t10::foo} as FnOnce<()>>::Output == String`
--> $DIR/fail.rs:111:24
|
111 | #[prop_or_else(foo)]
- | ^^^
- | |
- | expected struct `std::string::String`, found `i32`
- | help: try using a conversion method: `foo.to_string()`
+ | ^^^ expected struct `String`, found `i32`
+ |
+ = note: required by `Option::::unwrap_or_else`
diff --git a/packages/yew-macro/tests/derive_props/pass.rs b/packages/yew-macro/tests/derive_props/pass.rs
index f00b5549eee..26718efdca3 100644
--- a/packages/yew-macro/tests/derive_props/pass.rs
+++ b/packages/yew-macro/tests/derive_props/pass.rs
@@ -185,4 +185,18 @@ mod t10 {
}
}
+mod t11 {
+ use super::*;
+
+ #[derive(Clone, Properties)]
+ pub struct Props {
+ value: Option,
+ }
+
+ fn optional_prop_generics_should_work() {
+ Props::::builder().build();
+ Props::::builder().value(true).build();
+ }
+}
+
fn main() {}
diff --git a/packages/yew-macro/tests/derive_props_test.rs b/packages/yew-macro/tests/derive_props_test.rs
index 0855a7c0d56..0f83e8bc4fa 100644
--- a/packages/yew-macro/tests/derive_props_test.rs
+++ b/packages/yew-macro/tests/derive_props_test.rs
@@ -1,5 +1,5 @@
#[allow(dead_code)]
-#[rustversion::attr(stable(1.45), test)]
+#[rustversion::attr(stable(1.51), test)]
fn derive_props() {
let t = trybuild::TestCases::new();
t.pass("tests/derive_props/pass.rs");
diff --git a/packages/yew-macro/tests/html_macro/html-block-fail.stderr b/packages/yew-macro/tests/html_macro/html-block-fail.stderr
index 3c4a8d62d25..2a827e00d7b 100644
--- a/packages/yew-macro/tests/html_macro/html-block-fail.stderr
+++ b/packages/yew-macro/tests/html_macro/html-block-fail.stderr
@@ -6,12 +6,12 @@ error[E0277]: `()` doesn't implement `std::fmt::Display`
|
= help: the trait `std::fmt::Display` is not implemented for `()`
= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `()`
- = note: required because of the requirements on the impl of `std::convert::From<()>` for `yew::virtual_dom::vnode::VNode`
- = note: required because of the requirements on the impl of `std::convert::Into` for `()`
- = note: required because of the requirements on the impl of `std::convert::From<()>` for `yew::utils::NodeSeq<(), yew::virtual_dom::vnode::VNode>`
- = note: required because of the requirements on the impl of `std::convert::Into>` for `()`
- = note: required by `std::convert::Into::into`
+ = note: required because of the requirements on the impl of `ToString` for `()`
+ = note: required because of the requirements on the impl of `From<()>` for `VNode`
+ = note: required because of the requirements on the impl of `Into` for `()`
+ = note: 2 redundant requirements hidden
+ = note: required because of the requirements on the impl of `Into>` for `()`
+ = note: required by `into`
error[E0277]: `()` doesn't implement `std::fmt::Display`
--> $DIR/html-block-fail.rs:12:16
@@ -21,12 +21,12 @@ error[E0277]: `()` doesn't implement `std::fmt::Display`
|
= help: the trait `std::fmt::Display` is not implemented for `()`
= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `()`
- = note: required because of the requirements on the impl of `std::convert::From<()>` for `yew::virtual_dom::vnode::VNode`
- = note: required because of the requirements on the impl of `std::convert::Into` for `()`
- = note: required because of the requirements on the impl of `std::convert::From<()>` for `yew::utils::NodeSeq<(), yew::virtual_dom::vnode::VNode>`
- = note: required because of the requirements on the impl of `std::convert::Into>` for `()`
- = note: required by `std::convert::Into::into`
+ = note: required because of the requirements on the impl of `ToString` for `()`
+ = note: required because of the requirements on the impl of `From<()>` for `VNode`
+ = note: required because of the requirements on the impl of `Into` for `()`
+ = note: 2 redundant requirements hidden
+ = note: required because of the requirements on the impl of `Into>` for `()`
+ = note: required by `into`
error[E0277]: `()` doesn't implement `std::fmt::Display`
--> $DIR/html-block-fail.rs:15:17
@@ -37,10 +37,10 @@ error[E0277]: `()` doesn't implement `std::fmt::Display`
::: $WORKSPACE/packages/yew/src/utils.rs
|
| T: Into,
- | ------- required by this bound in `yew::utils::into_node_iter`
+ | ------- required by this bound in `into_node_iter`
|
= help: the trait `std::fmt::Display` is not implemented for `()`
= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `()`
- = note: required because of the requirements on the impl of `std::convert::From<()>` for `yew::virtual_dom::vnode::VNode`
- = note: required because of the requirements on the impl of `std::convert::Into` for `()`
+ = note: required because of the requirements on the impl of `ToString` for `()`
+ = note: required because of the requirements on the impl of `From<()>` for `VNode`
+ = note: required because of the requirements on the impl of `Into` for `()`
diff --git a/packages/yew-macro/tests/html_macro/html-component-fail.rs b/packages/yew-macro/tests/html_macro/html-component-fail.rs
index 9025beff2e2..f0113530ebe 100644
--- a/packages/yew-macro/tests/html_macro/html-component-fail.rs
+++ b/packages/yew-macro/tests/html_macro/html-component-fail.rs
@@ -135,8 +135,6 @@ fn compile_fail() {
{ 1 }
{ 2 }
};
-
- html! { ` properties to accomplish the same thing.
- --> $DIR/html-component-fail.rs:139:28
- |
-139 | html! { `
-error[E0277]: the trait bound `yew::virtual_dom::vcomp::VComp: yew::virtual_dom::Transformer<(), std::string::String>` is not satisfied
+error[E0277]: the trait bound `(): IntoPropValue` is not satisfied
--> $DIR/html-component-fail.rs:98:33
|
98 | html! { >
- >>
- >>
- >
- and 3 others
- = note: required by `yew::virtual_dom::Transformer::transform`
-
-error[E0277]: the trait bound `yew::virtual_dom::vcomp::VComp: yew::virtual_dom::Transformer<{integer}, std::string::String>` is not satisfied
+ | ^^ the trait `IntoPropValue` is not implemented for `()`
+
+error[E0277]: the trait bound `{integer}: IntoPropValue` is not satisfied
--> $DIR/html-component-fail.rs:99:33
|
99 | html! { ` is not implemented for `{integer}`
|
= help: the following implementations were found:
- >
- >>
- >>
- >
- and 3 others
- = note: required by `yew::virtual_dom::Transformer::transform`
-
-error[E0277]: the trait bound `yew::virtual_dom::vcomp::VComp: yew::virtual_dom::Transformer<{integer}, std::string::String>` is not satisfied
- --> $DIR/html-component-fail.rs:100:33
+ <&'static str as IntoPropValue>>
+ <&'static str as IntoPropValue>
+ <&T as IntoPropValue>>
+ <&T as IntoPropValue>
+ and 4 others
+
+error[E0277]: the trait bound `{integer}: IntoPropValue` is not satisfied
+ --> $DIR/html-component-fail.rs:100:26
|
100 | html! { ` is not implemented for `{integer}`
|
= help: the following implementations were found:
- >
- >>
- >>
- >
- and 3 others
- = note: required by `yew::virtual_dom::Transformer::transform`
+ <&'static str as IntoPropValue>>
+ <&'static str as IntoPropValue>
+ <&T as IntoPropValue>>
+ <&T as IntoPropValue>
+ and 4 others
error[E0308]: mismatched types
--> $DIR/html-component-fail.rs:101:30
|
101 | html! { ` is not satisfied
+error[E0277]: the trait bound `u32: IntoPropValue` is not satisfied
--> $DIR/html-component-fail.rs:103:24
|
103 | html! { ` is not implemented for `yew::virtual_dom::vcomp::VComp`
- |
- = help: the following implementations were found:
- >
- >>
- >>
- >
- and 3 others
- = note: required by `yew::virtual_dom::Transformer::transform`
+ | ^^^^ the trait `IntoPropValue` is not implemented for `u32`
error[E0599]: no method named `string` found for struct `ChildPropertiesBuilder` in the current scope
--> $DIR/html-component-fail.rs:104:20
@@ -281,10 +257,6 @@ error[E0599]: no method named `string` found for struct `ChildPropertiesBuilder<
...
104 | html! { `
- |
- = help: items from traits can only be used if the trait is implemented and in scope
- = note: the following trait defines an item `string`, perhaps you need to implement it:
- candidate #1: `proc_macro::bridge::server::Literal`
error[E0609]: no field `children` on type `ChildProperties`
--> $DIR/html-component-fail.rs:108:14
@@ -319,10 +291,6 @@ error[E0599]: no method named `build` found for struct `ChildContainerProperties
...
117 | html! { `
- |
- = help: items from traits can only be used if the trait is implemented and in scope
- = note: the following trait defines an item `build`, perhaps you need to implement it:
- candidate #1: `proc_macro::bridge::server::TokenStreamBuilder`
error[E0599]: no method named `build` found for struct `ChildContainerPropertiesBuilder` in the current scope
--> $DIR/html-component-fail.rs:118:14
@@ -332,34 +300,30 @@ error[E0599]: no method named `build` found for struct `ChildContainerProperties
...
118 | html! { `
- |
- = help: items from traits can only be used if the trait is implemented and in scope
- = note: the following trait defines an item `build`, perhaps you need to implement it:
- candidate #1: `proc_macro::bridge::server::TokenStreamBuilder`
-error[E0277]: the trait bound `yew::virtual_dom::vcomp::VChild: std::convert::From` is not satisfied
+error[E0277]: the trait bound `VChild: From` is not satisfied
--> $DIR/html-component-fail.rs:119:31
|
119 | html! { { "Not allowed" } };
- | ^^^^^^^^^^^^^ the trait `std::convert::From` is not implemented for `yew::virtual_dom::vcomp::VChild`
+ | ^^^^^^^^^^^^^ the trait `From` is not implemented for `VChild`
|
- = note: required because of the requirements on the impl of `std::convert::Into>` for `yew::virtual_dom::vtext::VText`
- = note: required by `std::convert::Into::into`
+ = note: required because of the requirements on the impl of `Into>` for `yew::virtual_dom::VText`
+ = note: required by `into`
-error[E0277]: the trait bound `yew::virtual_dom::vcomp::VChild: std::convert::From` is not satisfied
+error[E0277]: the trait bound `VChild: From` is not satisfied
--> $DIR/html-component-fail.rs:120:29
|
120 | html! { <> };
- | ^ the trait `std::convert::From` is not implemented for `yew::virtual_dom::vcomp::VChild`
+ | ^ the trait `From` is not implemented for `VChild`
|
- = note: required because of the requirements on the impl of `std::convert::Into>` for `yew::virtual_dom::vnode::VNode`
- = note: required by `std::convert::Into::into`
+ = note: required because of the requirements on the impl of `Into>` for `VNode`
+ = note: required by `into`
-error[E0277]: the trait bound `yew::virtual_dom::vcomp::VChild: std::convert::From` is not satisfied
+error[E0277]: the trait bound `VChild: From` is not satisfied
--> $DIR/html-component-fail.rs:121:30
|
121 | html! { ` is not implemented for `yew::virtual_dom::vcomp::VChild`
+ | ^^^^^ the trait `From` is not implemented for `VChild`
|
- = note: required because of the requirements on the impl of `std::convert::Into>` for `yew::virtual_dom::vnode::VNode`
- = note: required by `std::convert::Into::into`
+ = note: required because of the requirements on the impl of `Into>` for `VNode`
+ = note: required by `into`
diff --git a/packages/yew-macro/tests/html_macro/html-component-pass.rs b/packages/yew-macro/tests/html_macro/html-component-pass.rs
index 4c6bf71b1cf..6ad48d1792d 100644
--- a/packages/yew-macro/tests/html_macro/html-component-pass.rs
+++ b/packages/yew-macro/tests/html_macro/html-component-pass.rs
@@ -208,9 +208,7 @@ fn compile_pass() {
> />
};
diff --git a/packages/yew-macro/tests/html_macro/html-component-unimplemented-fail.stderr b/packages/yew-macro/tests/html_macro/html-component-unimplemented-fail.stderr
index 97550a4c112..c5cddede8e3 100644
--- a/packages/yew-macro/tests/html_macro/html-component-unimplemented-fail.stderr
+++ b/packages/yew-macro/tests/html_macro/html-component-unimplemented-fail.stderr
@@ -1,17 +1,17 @@
-error[E0599]: no function or associated item named `new` found for struct `yew::virtual_dom::vcomp::VChild` in the current scope
+error[E0599]: the function or associated item `new` exists for struct `VChild`, but its trait bounds were not satisfied
--> $DIR/html-component-unimplemented-fail.rs:8:14
|
5 | struct Unimplemented;
- | --------------------- doesn't satisfy `Unimplemented: yew::html::component::Component`
+ | --------------------- doesn't satisfy `Unimplemented: yew::Component`
...
8 | html! { `
+ | ^^^^^^^^^^^^^ function or associated item cannot be called on `VChild` due to unsatisfied trait bounds
|
- = note: the method `new` exists but the following trait bounds were not satisfied:
- `Unimplemented: yew::html::component::Component`
+ = note: the following trait bounds were not satisfied:
+ `Unimplemented: yew::Component`
-error[E0277]: the trait bound `Unimplemented: yew::html::component::Component` is not satisfied
+error[E0277]: the trait bound `Unimplemented: yew::Component` is not satisfied
--> $DIR/html-component-unimplemented-fail.rs:8:14
|
8 | html! {
{ §ion.title }
diff --git a/examples/router/src/switch.rs b/examples/router/src/switch.rs index 1303ada9d7c..28c1bb2fa71 100644 --- a/examples/router/src/switch.rs +++ b/examples/router/src/switch.rs @@ -1,7 +1,4 @@ -use yew::{ - virtual_dom::{Transformer, VComp}, - web_sys::Url, -}; +use yew::{html::IntoPropValue, web_sys::Url}; use yew_router::{components::RouterAnchor, prelude::*, switch::Permissive}; #[derive(Clone, Debug, Switch)] @@ -79,9 +76,9 @@ impl Switch for PublicUrlSwitch { // this allows us to pass `AppRoute` to components which take `PublicUrlSwitch`. -impl Transformer{ format!("Post #{}", self.id) }
{text}
-
-///
+///
///
///
/// }
diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml
index 2df620e7c5d..a6e497471e1 100644
--- a/packages/yew-macro/Makefile.toml
+++ b/packages/yew-macro/Makefile.toml
@@ -1,6 +1,6 @@
[tasks.test]
clear = true
-toolchain = "1.45.2"
+toolchain = "1.51"
command = "cargo"
args = ["test"]
diff --git a/packages/yew-macro/src/derive_props/field.rs b/packages/yew-macro/src/derive_props/field.rs
index d80798018ed..e24bc3b7a04 100644
--- a/packages/yew-macro/src/derive_props/field.rs
+++ b/packages/yew-macro/src/derive_props/field.rs
@@ -5,12 +5,13 @@ use std::cmp::{Ord, Ordering, PartialEq, PartialOrd};
use std::convert::TryFrom;
use syn::parse::Result;
use syn::spanned::Spanned;
-use syn::{Error, Expr, Field, Type, Visibility};
+use syn::{Error, Expr, Field, Type, TypePath, Visibility};
#[allow(clippy::large_enum_variant)]
#[derive(PartialEq, Eq)]
enum PropAttr {
Required { wrapped_name: Ident },
+ Option,
PropOr(Expr),
PropOrElse(Expr),
PropOrDefault,
@@ -37,36 +38,59 @@ impl PropField {
)
}
+ /// Ident of the wrapped field name
+ fn wrapped_name(&self) -> &Ident {
+ match &self.attr {
+ PropAttr::Required { wrapped_name } => wrapped_name,
+ _ => &self.name,
+ }
+ }
+
/// Used to transform the `PropWrapper` struct into `Properties`
pub fn to_field_setter(&self) -> proc_macro2::TokenStream {
let name = &self.name;
match &self.attr {
PropAttr::Required { wrapped_name } => {
quote! {
- #name: self.wrapped.#wrapped_name.unwrap(),
+ #name: ::std::option::Option::unwrap(self.wrapped.#wrapped_name),
}
}
- _ => {
+ PropAttr::Option => {
quote! {
#name: self.wrapped.#name,
}
}
+ PropAttr::PropOr(value) => {
+ quote_spanned! {value.span()=>
+ #name: ::std::option::Option::unwrap_or(self.wrapped.#name, #value),
+ }
+ }
+ PropAttr::PropOrElse(func) => {
+ quote_spanned! {func.span()=>
+ #name: ::std::option::Option::unwrap_or_else(self.wrapped.#name, #func),
+ }
+ }
+ PropAttr::PropOrDefault => {
+ quote! {
+ #name: ::std::option::Option::unwrap_or_default(self.wrapped.#name),
+ }
+ }
}
}
/// Wrap all required props in `Option`
pub fn to_field_def(&self) -> proc_macro2::TokenStream {
let ty = &self.ty;
+ let wrapped_name = self.wrapped_name();
match &self.attr {
- PropAttr::Required { wrapped_name } => {
+ PropAttr::Option => {
quote! {
- #wrapped_name: ::std::option::Option<#ty>,
+ #wrapped_name: #ty,
}
}
_ => {
- let name = &self.name;
quote! {
- #name: #ty,
+ #wrapped_name: ::std::option::Option<#ty>,
}
}
}
@@ -74,32 +98,9 @@ impl PropField {
/// All optional props must implement the `Default` trait
pub fn to_default_setter(&self) -> proc_macro2::TokenStream {
- match &self.attr {
- PropAttr::Required { wrapped_name } => {
- quote! {
- #wrapped_name: ::std::option::Option::None,
- }
- }
- PropAttr::PropOr(value) => {
- let name = &self.name;
- let span = value.span();
- quote_spanned! {span=>
- #name: #value,
- }
- }
- PropAttr::PropOrElse(func) => {
- let name = &self.name;
- let span = func.span();
- quote_spanned! {span=>
- #name: (#func)(),
- }
- }
- PropAttr::PropOrDefault => {
- let name = &self.name;
- quote! {
- #name: ::std::default::Default::default(),
- }
- }
+ let wrapped_name = self.wrapped_name();
+ quote! {
+ #wrapped_name: ::std::option::Option::None,
}
}
@@ -115,8 +116,8 @@ impl PropField {
PropAttr::Required { wrapped_name } => {
quote! {
#[doc(hidden)]
- #vis fn #name(mut self, #name: #ty) -> #builder_name<#generic_arguments> {
- self.wrapped.#wrapped_name = ::std::option::Option::Some(#name);
+ #vis fn #name(mut self, #name: impl ::yew::html::IntoPropValue<#ty>) -> #builder_name<#generic_arguments> {
+ self.wrapped.#wrapped_name = ::std::option::Option::Some(#name.into_prop_value());
#builder_name {
wrapped: self.wrapped,
_marker: ::std::marker::PhantomData,
@@ -124,11 +125,20 @@ impl PropField {
}
}
}
+ PropAttr::Option => {
+ quote! {
+ #[doc(hidden)]
+ #vis fn #name(mut self, #name: impl ::yew::html::IntoPropValue<#ty>) -> #builder_name<#generic_arguments> {
+ self.wrapped.#name = #name.into_prop_value();
+ self
+ }
+ }
+ }
_ => {
quote! {
#[doc(hidden)]
- #vis fn #name(mut self, #name: #ty) -> #builder_name<#generic_arguments> {
- self.wrapped.#name = #name;
+ #vis fn #name(mut self, #name: impl ::yew::html::IntoPropValue<#ty>) -> #builder_name<#generic_arguments> {
+ self.wrapped.#name = ::std::option::Option::Some(#name.into_prop_value());
self
}
}
@@ -154,6 +164,12 @@ impl PropField {
} else {
unreachable!()
}
+ } else if matches!(
+ &named_field.ty,
+ Type::Path(TypePath { path, .. })
+ if path.segments.len() == 1 && path.segments[0].ident == "Option"
+ ) {
+ Ok(PropAttr::Option)
} else {
let ident = named_field.ident.as_ref().unwrap();
let wrapped_name = Ident::new(&format!("{}_wrapper", ident), Span::call_site());
diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs
index 9774fdcd39c..4039b1aba3d 100644
--- a/packages/yew-macro/src/html_tree/html_element.rs
+++ b/packages/yew-macro/src/html_tree/html_element.rs
@@ -1,7 +1,7 @@
use super::{HtmlChildrenTree, HtmlDashedName, TagTokens};
use crate::props::{ClassesForm, ElementProps, Prop};
use crate::stringify::Stringify;
-use crate::{non_capitalized_ascii, stringify, Peek, PeekValue};
+use crate::{non_capitalized_ascii, Peek, PeekValue};
use boolinator::Boolinator;
use proc_macro2::{Delimiter, TokenStream};
use quote::{quote, quote_spanned, ToTokens};
@@ -139,199 +139,107 @@ impl ToTokens for HtmlElement {
}
});
let set_key = key.as_ref().map(|attr| {
- let value = &attr.value;
+ let value = attr.value.optimize_literals();
quote! {
- #vtag.key = ::std::option::Option::Some(::std::convert::Into::<::yew::virtual_dom::Key>::into(#value));
+ #vtag.__macro_set_key(#value);
}
});
let set_value = value.as_ref().map(|attr| {
- let value = &attr.value;
- if attr.question_mark.is_some() {
- quote_spanned! {value.span()=>
- if let ::std::option::Option::Some(__yew_v) = ::std::option::Option::as_ref(&(#value)) {
- #vtag.set_value(__yew_v);
- };
- }
- } else {
- quote_spanned! {value.span()=>
- #vtag.set_value(&(#value));
- }
+ let value = attr.value.optimize_literals();
+ quote! {
+ #vtag.set_value(#value);
}
});
let set_kind = kind.as_ref().map(|attr| {
- let value = &attr.value;
- if attr.question_mark.is_some() {
- let sr = stringify::stringify_option_at_runtime(value);
- quote_spanned! {value.span()=>
- if let ::std::option::Option::Some(__yew_v) = #sr {
- #vtag.set_kind(__yew_v);
- };
- }
- } else {
- let sr = value.stringify();
- quote_spanned! {value.span()=>
- #vtag.set_kind(#sr);
- }
+ let value = attr.value.optimize_literals();
+ quote! {
+ #vtag.set_kind(#value);
}
});
let set_checked = checked.as_ref().map(|attr| {
let value = &attr.value;
- quote_spanned! {value.span()=>
+ quote! {
#vtag.set_checked(#value);
}
});
- // normal attributes
+ // other attributes
- let set_attributes = if attributes.is_empty() {
- None
- } else {
- let attrs = attributes.iter().map(
- |Prop {
- label,
- question_mark,
- value,
- ..
- }| {
- let key = label.to_lit_str();
- if question_mark.is_some() {
- let sr = stringify::stringify_option_at_runtime(value);
- quote! {
- ::yew::virtual_dom::PositionalAttr(#key, #sr)
- }
- } else {
- let sr = value.stringify();
- quote! {
- ::yew::virtual_dom::PositionalAttr::new(#key, #sr)
- }
- }
- },
- );
- Some(quote! {
- #vtag.attributes = ::yew::virtual_dom::Attributes::Vec(::std::vec![#(#attrs),*]);
- })
- };
-
- let push_booleans = if booleans.is_empty() {
- None
- } else {
- let tokens = booleans
- .iter()
- .map(|Prop { label, value, .. }| {
- let label_str = label.to_lit_str();
- let sr = label.stringify();
- quote_spanned! {value.span()=> {
- if #value {
- #vtag.__macro_push_attribute(#label_str, #sr);
- } else {
- #vtag.__macro_push_attribute_placeholder(#label_str);
+ let set_attributes = {
+ let normal_attrs = attributes.iter().map(|Prop { label, value, .. }| {
+ let key = label.to_lit_str();
+ let value = value.optimize_literals();
+ quote! {
+ ::yew::virtual_dom::PositionalAttr::new(#key, #value)
+ }
+ });
+ let boolean_attrs = booleans.iter().map(|Prop { label, value, .. }| {
+ let key = label.to_lit_str();
+ quote! {
+ ::yew::virtual_dom::PositionalAttr::new_boolean(#key, #value)
+ }
+ });
+ let class_attr = classes.as_ref().and_then(|classes| match classes {
+ ClassesForm::Tuple(classes) => {
+ let span = classes.span();
+ let classes: Vec<_> = classes.elems.iter().collect();
+ let n = classes.len();
+
+ let deprecation_warning = quote_spanned! {span=>
+ #[deprecated(
+ note = "the use of `(...)` with the attribute `class` is deprecated and will be removed in version 0.19. Use the `classes!` macro instead."
+ )]
+ fn deprecated_use_of_class() {}
+
+ if false {
+ deprecated_use_of_class();
};
- }}
- })
- .collect:: };
html! {
};
- html! {
};
html! { };
- html! { };
- html! { ![]()
};
+
+ // tag mismatch
+ html! {
};
- html! { };
+
+ // missing opening tag
+ html! {
};
html! { };
html! { };
+ html! { };
+
+ // multiple root
+ html! { };
+ // invalid child content
html! {
Invalid
};
+ // same attribute specified multiple times (tests for attributes with special treatment)
html! { };
html! { };
html! { };
@@ -21,45 +30,47 @@ fn compile_fail() {
html! { };
html! { };
html! { };
+ html! { };
+ // boolean attribute type mismatch
html! { };
+ html! { };
html! { };
+ html! { };
html! { };
+
+ // normal attribute type mismatch
html! { };
html! { };
html! { };
+ html! { };
+ html! { };
+ html! { };
+ // listener type mismatch
html! { };
html! { };
+ html! { };
- html! { };
-
+ // NodeRef type mismatch
html! { };
- html! { };
+ html! { };
+ // void element with children
html! { };
+ // make sure that capitalization doesn't matter for the void children check
html! { };
+ // no tag name
html! { <@> };
- html! { <@{"test"}> };
- html! { <@{55}> };
html! { <@/> };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
- html! { };
+ // invalid closing tag
+ html! { <@{"test"}> };
+ // type mismatch
+ html! { <@{55}> };
+ // check for deprecation warning
html! { };
}
diff --git a/packages/yew-macro/tests/html_macro/html-element-fail.stderr b/packages/yew-macro/tests/html_macro/html-element-fail.stderr
index e9305534bf7..ac518f9c877 100644
--- a/packages/yew-macro/tests/html_macro/html-element-fail.stderr
+++ b/packages/yew-macro/tests/html_macro/html-element-fail.stderr
@@ -1,44 +1,26 @@
error: this opening tag has no corresponding closing tag
- --> $DIR/html-element-fail.rs:6:13
+ --> $DIR/html-element-fail.rs:7:13
|
-6 | html! { };
+7 | html! {
};
| ^^^^^
error: this opening tag has no corresponding closing tag
- --> $DIR/html-element-fail.rs:7:18
+ --> $DIR/html-element-fail.rs:8:18
|
-7 | html! {
};
+8 | html! {
};
| ^^^^^
-error: this closing tag has no corresponding opening tag
- --> $DIR/html-element-fail.rs:8:13
- |
-8 | html! {
};
- | ^^^^^^
-
error: this opening tag has no corresponding closing tag
--> $DIR/html-element-fail.rs:9:13
|
9 | html! { };
| ^^^^^
-error: only one root html element is allowed (hint: you can wrap multiple html elements in a fragment `<>`)
- --> $DIR/html-element-fail.rs:10:24
- |
-10 | html! { };
- | ^^^^^^^^^^^
-
-error: this closing tag has no corresponding opening tag
- --> $DIR/html-element-fail.rs:11:18
- |
-11 | html! { ![]()
};
| ^^^^^^
+error: this closing tag has no corresponding opening tag
+ --> $DIR/html-element-fail.rs:17:18
+ |
+17 | html! {
};
- | ^^^^^^^
-
error: this closing tag has no corresponding opening tag
- --> $DIR/html-element-fail.rs:12:20
+ --> $DIR/html-element-fail.rs:12:13
|
-12 | html! { };
- | ^^^^^^^^
+12 | html! {
};
+ | ^^^^^^
error: this closing tag has no corresponding opening tag
--> $DIR/html-element-fail.rs:13:18
@@ -52,325 +34,309 @@ error: only one root html element is allowed (hint: you can wrap multiple html e
14 | html! { };
+ | ^^^^^^^
+
+error: this closing tag has no corresponding opening tag
+ --> $DIR/html-element-fail.rs:18:20
+ |
+18 | html! { };
+ | ^^^^^^^^
+
+error: only one root html element is allowed (hint: you can wrap multiple html elements in a fragment `<>`)
+ --> $DIR/html-element-fail.rs:21:24
+ |
+21 | html! { };
+ | ^^^^^^^^^^^
+
error: expected a valid html element
- --> $DIR/html-element-fail.rs:15:18
+ --> $DIR/html-element-fail.rs:23:18
|
-15 | html! { `
- found type `{integer}`
-
-error[E0308]: mismatched types
- --> $DIR/html-element-fail.rs:33:28
+ --> $DIR/html-element-fail.rs:37:28
|
-33 | html! { };
- | ^^^^^^^^ expected struct `web_sys::features::gen_MouseEvent::MouseEvent`, found struct `std::string::String`
+37 | html! { };
+ | ^^^^^^^^^^^ expected `bool`, found enum `Option`
|
- = note: expected enum `yew::callback::Callback`
- found enum `yew::callback::Callback`
-
-error[E0277]: `NotToString` doesn't implement `std::fmt::Display`
- --> $DIR/html-element-fail.rs:35:27
- |
-35 | html! { };
- | ^^^^^^^^^^^ `NotToString` cannot be formatted with the default formatter
- |
- = help: the trait `std::fmt::Display` is not implemented for `NotToString`
- = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `NotToString`
- = note: required by `std::string::ToString::to_string`
+ = note: expected type `bool`
+ found enum `Option`
error[E0308]: mismatched types
- --> $DIR/html-element-fail.rs:37:24
- |
-37 | html! { };
- | ^^ expected struct `yew::html::NodeRef`, found `()`
-
-error[E0277]: the trait bound `std::borrow::Cow<'static, str>: std::convert::From<{integer}>` is not satisfied
- --> $DIR/html-element-fail.rs:45:15
- |
-45 | html! { <@{55}> };
- | ^^^^ the trait `std::convert::From<{integer}>` is not implemented for `std::borrow::Cow<'static, str>`
+ --> $DIR/html-element-fail.rs:38:29
|
- = help: the following implementations were found:
- as std::convert::From<&'a [T]>>
- as std::convert::From<&'a std::vec::Vec>>
- as std::convert::From>>
-
Invalid
};
+23 | html! { Invalid
};
| ^^^^^^^
error: `attr` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:17:27
+ --> $DIR/html-element-fail.rs:26:27
|
-17 | html! { };
+26 | html! { };
| ^^^^
error: `value` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:18:32
+ --> $DIR/html-element-fail.rs:27:32
|
-18 | html! { };
+27 | html! { };
| ^^^^^
error: `kind` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:19:36
+ --> $DIR/html-element-fail.rs:28:36
|
-19 | html! { };
+28 | html! { };
| ^^^^
error: `checked` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:20:33
+ --> $DIR/html-element-fail.rs:29:33
|
-20 | html! { };
+29 | html! { };
| ^^^^^^^
error: `disabled` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:21:34
+ --> $DIR/html-element-fail.rs:30:34
|
-21 | html! { };
+30 | html! { };
| ^^^^^^^^
error: `selected` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:22:35
+ --> $DIR/html-element-fail.rs:31:35
|
-22 | html! { };
+31 | html! { };
| ^^^^^^^^
error: `class` can only be specified once but is given here again
- --> $DIR/html-element-fail.rs:23:32
+ --> $DIR/html-element-fail.rs:32:32
|
-23 | html! { };
+32 | html! { };
| ^^^^^
error: `ref` can only be specified once
- --> $DIR/html-element-fail.rs:38:20
+ --> $DIR/html-element-fail.rs:33:20
|
-38 | html! { };
+33 | html! { };
| ^^^
error: the tag `` is a void element and cannot have children (hint: rewrite this as ``)
- --> $DIR/html-element-fail.rs:40:13
+ --> $DIR/html-element-fail.rs:60:13
|
-40 | html! { };
+60 | html! { };
| ^^^^^^^^^^^^^^^^^^^
error: the tag `` is a void element and cannot have children (hint: rewrite this as ``)
- --> $DIR/html-element-fail.rs:41:13
+ --> $DIR/html-element-fail.rs:62:13
|
-41 | html! { };
+62 | html! { };
| ^^^^^^^^^^^^^^^^^^^
error: this dynamic tag is missing an expression block defining its value
- --> $DIR/html-element-fail.rs:43:14
+ --> $DIR/html-element-fail.rs:65:14
|
-43 | html! { <@> };
+65 | html! { <@> };
| ^
-error: dynamic closing tags must not have a body (hint: replace it with just ``)
- --> $DIR/html-element-fail.rs:44:27
- |
-44 | html! { <@{"test"}> };
- | ^^^^^^^^
-
error: this dynamic tag is missing an expression block defining its value
- --> $DIR/html-element-fail.rs:46:14
+ --> $DIR/html-element-fail.rs:66:14
|
-46 | html! { <@/> };
+66 | html! { <@/> };
| ^
-error: boolean attributes don't support being used as an optional attribute (hint: a value of false results in the attribute not being set)
- --> $DIR/html-element-fail.rs:50:20
- |
-50 | html! { };
- | ^^^^^^^^
-
-error: `checked` does not support being used as an optional attribute
- --> $DIR/html-element-fail.rs:58:20
- |
-58 | html! { };
- | ^^^^^^^^^
-
-error: `ref` does not support being used as an optional attribute
- --> $DIR/html-element-fail.rs:59:20
+error: dynamic closing tags must not have a body (hint: replace it with just ``)
+ --> $DIR/html-element-fail.rs:69:27
|
-59 | html! { };
- | ^^^^^
+69 | html! { <@{"test"}> };
+ | ^^^^^^^^
-warning: use of deprecated item 'compile_fail::deprecated_use_of_class': the use of `(...)` with the attribute `class` is deprecated and will be removed in version 0.19. Use the `classes!` macro instead.
- --> $DIR/html-element-fail.rs:63:24
+warning: use of deprecated function `compile_fail::deprecated_use_of_class`: the use of `(...)` with the attribute `class` is deprecated and will be removed in version 0.19. Use the `classes!` macro instead.
+ --> $DIR/html-element-fail.rs:74:24
|
-63 | html! { };
+74 | html! { };
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `#[warn(deprecated)]` on by default
error[E0308]: mismatched types
- --> $DIR/html-element-fail.rs:25:28
+ --> $DIR/html-element-fail.rs:36:28
|
-25 | html! { };
+36 | html! { };
| ^ expected `bool`, found integer
error[E0308]: mismatched types
- --> $DIR/html-element-fail.rs:26:29
- |
-26 | html! { };
- | ^ expected `bool`, found integer
-
-error[E0308]: mismatched types
- --> $DIR/html-element-fail.rs:27:30
- |
-27 | html! { };
- | ^ expected `bool`, found integer
-
-error[E0277]: `()` doesn't implement `std::fmt::Display`
- --> $DIR/html-element-fail.rs:28:25
- |
-28 | html! { };
- | ^^ `()` cannot be formatted with the default formatter
- |
- = help: the trait `std::fmt::Display` is not implemented for `()`
- = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `()`
- = note: required by `std::string::ToString::to_string`
-
-error[E0277]: `()` doesn't implement `std::fmt::Display`
- --> $DIR/html-element-fail.rs:29:26
- |
-29 | html! { };
- | ^^ `()` cannot be formatted with the default formatter
- |
- = help: the trait `std::fmt::Display` is not implemented for `()`
- = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `()`
-
-error[E0277]: `()` doesn't implement `std::fmt::Display`
- --> $DIR/html-element-fail.rs:30:21
- |
-30 | html! { };
- | ^^ `()` cannot be formatted with the default formatter
- |
- = help: the trait `std::fmt::Display` is not implemented for `()`
- = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
- = note: required because of the requirements on the impl of `std::string::ToString` for `()`
- = note: required by `std::string::ToString::to_string`
-
-error[E0308]: mismatched types
- --> $DIR/html-element-fail.rs:32:28
- |
-32 | html! { };
- | ^ expected enum `yew::callback::Callback`, found integer
- |
- = note: expected enum `yew::callback::Callback