diff --git a/examples/agents/Cargo.toml b/examples/agents/Cargo.toml index 1dbf8689adf..2181b30c7eb 100644 --- a/examples/agents/Cargo.toml +++ b/examples/agents/Cargo.toml @@ -2,7 +2,7 @@ name = "agents" version = "0.1.0" authors = ["Denis Kolodin "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/boids/Cargo.toml b/examples/boids/Cargo.toml index c65ab5c434f..3e44001d44d 100644 --- a/examples/boids/Cargo.toml +++ b/examples/boids/Cargo.toml @@ -2,7 +2,7 @@ name = "boids" version = "0.1.0" authors = ["motoki saito "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/contexts/Cargo.toml b/examples/contexts/Cargo.toml index 0a510a094b8..7deb6ccffcf 100644 --- a/examples/contexts/Cargo.toml +++ b/examples/contexts/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "contexts" version = "0.1.0" -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml index 00ad553e295..403a8299268 100644 --- a/examples/counter/Cargo.toml +++ b/examples/counter/Cargo.toml @@ -2,7 +2,7 @@ name = "counter" version = "0.1.1" authors = ["Denis Kolodin "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/dyn_create_destroy_apps/Cargo.toml b/examples/dyn_create_destroy_apps/Cargo.toml index b75e7bd2ac6..2cc223d0b39 100644 --- a/examples/dyn_create_destroy_apps/Cargo.toml +++ b/examples/dyn_create_destroy_apps/Cargo.toml @@ -2,7 +2,7 @@ name = "dyn_create_destroy_apps" version = "0.1.0" authors = ["Nicklas Warming Jacobsen "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/file_upload/Cargo.toml b/examples/file_upload/Cargo.toml index 7b51286b19d..4425b4ce29e 100644 --- a/examples/file_upload/Cargo.toml +++ b/examples/file_upload/Cargo.toml @@ -2,7 +2,7 @@ name = "file_upload" version = "0.1.0" authors = ["Denis Kolodin "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/function_memory_game/Cargo.toml b/examples/function_memory_game/Cargo.toml index cbcc4c83714..0a40468de18 100644 --- a/examples/function_memory_game/Cargo.toml +++ b/examples/function_memory_game/Cargo.toml @@ -2,7 +2,7 @@ name = "function_memory_game" version = "0.1.0" authors = ["Howard.Zuo "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/function_todomvc/Cargo.toml b/examples/function_todomvc/Cargo.toml index b91dfe14e37..4feb994c0f6 100644 --- a/examples/function_todomvc/Cargo.toml +++ b/examples/function_todomvc/Cargo.toml @@ -2,7 +2,7 @@ name = "function_todomvc" version = "0.1.0" authors = ["Drew Hutton "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/futures/Cargo.toml b/examples/futures/Cargo.toml index 8f09bf36ff9..7e473a68579 100644 --- a/examples/futures/Cargo.toml +++ b/examples/futures/Cargo.toml @@ -2,7 +2,7 @@ name = "futures" version = "0.1.0" authors = ["Henry Zimmerman "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/game_of_life/Cargo.toml b/examples/game_of_life/Cargo.toml index 38bf2c5d253..bb7c8fe1bd2 100644 --- a/examples/game_of_life/Cargo.toml +++ b/examples/game_of_life/Cargo.toml @@ -6,7 +6,7 @@ authors = [ "Ilya Bogdanov " ] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/inner_html/Cargo.toml b/examples/inner_html/Cargo.toml index a01639b3e6e..e8c10c2be3d 100644 --- a/examples/inner_html/Cargo.toml +++ b/examples/inner_html/Cargo.toml @@ -2,7 +2,7 @@ name = "inner_html" version = "0.1.0" authors = ["Garrett Berg "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/js_callback/Cargo.toml b/examples/js_callback/Cargo.toml index 26bad873e77..4d111bf0623 100644 --- a/examples/js_callback/Cargo.toml +++ b/examples/js_callback/Cargo.toml @@ -2,7 +2,7 @@ name = "js_callback" version = "0.1.0" authors = ["Scott Steele "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/keyed_list/Cargo.toml b/examples/keyed_list/Cargo.toml index 401b4755bf8..21be5cfdc5a 100644 --- a/examples/keyed_list/Cargo.toml +++ b/examples/keyed_list/Cargo.toml @@ -2,7 +2,7 @@ name = "keyed_list" version = "0.1.0" authors = ["Thomas Lacroix "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/mount_point/Cargo.toml b/examples/mount_point/Cargo.toml index 6c5024a4d4e..b62137a85ea 100644 --- a/examples/mount_point/Cargo.toml +++ b/examples/mount_point/Cargo.toml @@ -2,7 +2,7 @@ name = "mount_point" version = "0.1.0" authors = ["Ben Berman "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/nested_list/Cargo.toml b/examples/nested_list/Cargo.toml index d1404d9ab45..9c3678922a6 100644 --- a/examples/nested_list/Cargo.toml +++ b/examples/nested_list/Cargo.toml @@ -2,7 +2,7 @@ name = "nested_list" version = "0.1.0" authors = ["Justin Starry "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/node_refs/Cargo.toml b/examples/node_refs/Cargo.toml index 75af5074776..23fa0e436c7 100644 --- a/examples/node_refs/Cargo.toml +++ b/examples/node_refs/Cargo.toml @@ -2,7 +2,7 @@ name = "node_refs" version = "0.1.0" authors = ["Justin Starry "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/password_strength/Cargo.toml b/examples/password_strength/Cargo.toml index 701c74dba5e..c73f7ae6b62 100644 --- a/examples/password_strength/Cargo.toml +++ b/examples/password_strength/Cargo.toml @@ -2,7 +2,7 @@ name = "password_strength" version = "0.1.0" authors = ["Philip Peterson "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/examples/portals/Cargo.toml b/examples/portals/Cargo.toml index a29a6a82ff5..abf2f445939 100644 --- a/examples/portals/Cargo.toml +++ b/examples/portals/Cargo.toml @@ -2,7 +2,7 @@ name = "portals" version = "0.1.0" authors = ["Martin Molzer "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/router/Cargo.toml b/examples/router/Cargo.toml index 2acfeeb0e2b..598e8f84902 100644 --- a/examples/router/Cargo.toml +++ b/examples/router/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "router" version = "0.1.0" -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/simple_ssr/Cargo.toml b/examples/simple_ssr/Cargo.toml index e1d48e2cc1a..d4812fcc79b 100644 --- a/examples/simple_ssr/Cargo.toml +++ b/examples/simple_ssr/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "simple_ssr" version = "0.1.0" -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/suspense/Cargo.toml b/examples/suspense/Cargo.toml index abf59d759e6..1dc2b395a3a 100644 --- a/examples/suspense/Cargo.toml +++ b/examples/suspense/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "suspense" version = "0.1.0" -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/timer/Cargo.toml b/examples/timer/Cargo.toml index 5847ed2e877..e91b9d5cc16 100644 --- a/examples/timer/Cargo.toml +++ b/examples/timer/Cargo.toml @@ -2,7 +2,7 @@ name = "timer" version = "0.1.0" authors = ["Denis Kolodin "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml index bc4f60e124c..afaed5e48ab 100644 --- a/examples/todomvc/Cargo.toml +++ b/examples/todomvc/Cargo.toml @@ -2,7 +2,7 @@ name = "todomvc" version = "0.1.0" authors = ["Denis Kolodin "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/two_apps/Cargo.toml b/examples/two_apps/Cargo.toml index bd1b29dfcc4..af49ad8c276 100644 --- a/examples/two_apps/Cargo.toml +++ b/examples/two_apps/Cargo.toml @@ -2,7 +2,7 @@ name = "two_apps" version = "0.1.0" authors = ["Denis Kolodin "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/examples/web_worker_fib/Cargo.toml b/examples/web_worker_fib/Cargo.toml index b7798e04fde..ed6511de40a 100644 --- a/examples/web_worker_fib/Cargo.toml +++ b/examples/web_worker_fib/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "yew-worker-fib" version = "0.1.0" -edition = "2018" +edition = "2021" authors = ["Shrey Somaiya", "Zac Kologlu"] [lib] diff --git a/examples/webgl/Cargo.toml b/examples/webgl/Cargo.toml index 6a4b85ed050..32328eb99b5 100644 --- a/examples/webgl/Cargo.toml +++ b/examples/webgl/Cargo.toml @@ -2,7 +2,7 @@ name = "webgl" version = "0.1.0" authors = ["MikloĢs Tusz "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" [dependencies] diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index 9079a40b58d..73f647d8389 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent" version = "0.1.0" authors = ["Hamza "] -edition = "2018" +edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index 832a0fff3ab..cc99c648e0b 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "yew-macro" version = "0.19.3" -edition = "2018" +edition = "2021" authors = ["Justin Starry "] repository = "https://github.com/yewstack/yew" homepage = "https://github.com/yewstack/yew" diff --git a/packages/yew-macro/src/derive_props/builder.rs b/packages/yew-macro/src/derive_props/builder.rs index 02c1622ffba..7a9f6839ea6 100644 --- a/packages/yew-macro/src/derive_props/builder.rs +++ b/packages/yew-macro/src/derive_props/builder.rs @@ -65,19 +65,19 @@ impl ToTokens for PropsBuilder<'_> { #(impl #step_trait for #step_names {})* #[doc(hidden)] - #vis struct #builder_name#step_generics + #vis struct #builder_name #step_generics #where_clause { - wrapped: ::std::boxed::Box<#wrapper_name#ty_generics>, + wrapped: ::std::boxed::Box<#wrapper_name #ty_generics>, _marker: ::std::marker::PhantomData<#step_generic_param>, } #impl_steps - impl#impl_generics #builder_name<#generic_args> #where_clause { + impl #impl_generics #builder_name<#generic_args> #where_clause { #[doc(hidden)] - #vis fn build(self) -> #props_name#ty_generics { - #props_name#turbofish_generics { + #vis fn build(self) -> #props_name #ty_generics { + #props_name #turbofish_generics { #(#set_fields)* } } @@ -190,7 +190,7 @@ impl PropsBuilder<'_> { token_stream.extend(quote! { #( #extra_attrs )* - impl#impl_generics #builder_name<#current_step_arguments> #where_clause { + impl #impl_generics #builder_name<#current_step_arguments> #where_clause { #(#optional_prop_fn)* #(#required_prop_fn)* } diff --git a/packages/yew-macro/src/derive_props/mod.rs b/packages/yew-macro/src/derive_props/mod.rs index 1c214fb2c64..fd4aaf8a055 100644 --- a/packages/yew-macro/src/derive_props/mod.rs +++ b/packages/yew-macro/src/derive_props/mod.rs @@ -105,7 +105,7 @@ impl ToTokens for DerivePropsInput { // The properties trait has a `builder` method which creates the props builder let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); let properties = quote! { - impl#impl_generics ::yew::html::Properties for #props_name#ty_generics #where_clause { + impl #impl_generics ::yew::html::Properties for #props_name #ty_generics #where_clause { type Builder = #builder_name<#builder_generic_args>; fn builder() -> Self::Builder { diff --git a/packages/yew-macro/src/derive_props/wrapper.rs b/packages/yew-macro/src/derive_props/wrapper.rs index dc5f24f5bb0..4d862abbcc7 100644 --- a/packages/yew-macro/src/derive_props/wrapper.rs +++ b/packages/yew-macro/src/derive_props/wrapper.rs @@ -27,15 +27,15 @@ impl ToTokens for PropsWrapper<'_> { let wrapper = quote! { #(#extra_attrs)* - struct #wrapper_name#generics + struct #wrapper_name #generics #where_clause { #(#wrapper_field_defs)* } - impl#impl_generics ::std::default::Default for #wrapper_name#ty_generics #where_clause { + impl #impl_generics ::std::default::Default for #wrapper_name #ty_generics #where_clause { fn default() -> Self { - #wrapper_name#turbofish_generics { + #wrapper_name #turbofish_generics { #(#wrapper_default_setters)* } } diff --git a/packages/yew-macro/src/html_tree/html_dashed_name.rs b/packages/yew-macro/src/html_tree/html_dashed_name.rs index 10dd9653aaf..c0e4326570a 100644 --- a/packages/yew-macro/src/html_tree/html_dashed_name.rs +++ b/packages/yew-macro/src/html_tree/html_dashed_name.rs @@ -88,8 +88,8 @@ impl ToTokens for HtmlDashedName { let HtmlDashedName { name, extended } = self; let dashes = extended.iter().map(|(dash, _)| quote! {#dash}); let idents = extended.iter().map(|(_, ident)| quote! {#ident}); - let extended = quote! { #(#dashes#idents)* }; - tokens.extend(quote! { #name#extended }); + let extended = quote! { #(#dashes #idents)* }; + tokens.extend(quote! { #name #extended }); } } diff --git a/packages/yew-macro/src/html_tree/html_element.rs b/packages/yew-macro/src/html_tree/html_element.rs index 9b8ba908651..2b96125285e 100644 --- a/packages/yew-macro/src/html_tree/html_element.rs +++ b/packages/yew-macro/src/html_tree/html_element.rs @@ -498,7 +498,7 @@ impl Parse for DynamicName { impl ToTokens for DynamicName { fn to_tokens(&self, tokens: &mut TokenStream) { let Self { at, expr } = self; - tokens.extend(quote! {#at#expr}); + tokens.extend(quote! {#at #expr}); } } diff --git a/packages/yew-macro/src/html_tree/html_list.rs b/packages/yew-macro/src/html_tree/html_list.rs index 8b1c7d0f45d..4925ebdb3b3 100644 --- a/packages/yew-macro/src/html_tree/html_list.rs +++ b/packages/yew-macro/src/html_tree/html_list.rs @@ -72,7 +72,7 @@ impl ToTokens for HtmlList { let spanned = { let open = open.to_spanned(); let close = close.to_spanned(); - quote! { #open#close } + quote! { #open #close } }; tokens.extend(quote_spanned! {spanned.span()=> diff --git a/packages/yew-macro/src/html_tree/tag.rs b/packages/yew-macro/src/html_tree/tag.rs index 5521f08e384..b81dd64257f 100644 --- a/packages/yew-macro/src/html_tree/tag.rs +++ b/packages/yew-macro/src/html_tree/tag.rs @@ -145,6 +145,6 @@ impl TagTokens { /// This is to work around the limitation of being unable to manually join spans on stable. pub fn to_spanned(&self) -> impl ToTokens { let Self { lt, gt, .. } = self; - quote! {#lt#gt} + quote! {#lt #gt} } } diff --git a/packages/yew-macro/src/props/component.rs b/packages/yew-macro/src/props/component.rs index 2ca7c8c8cb8..7dcc97ac6a0 100644 --- a/packages/yew-macro/src/props/component.rs +++ b/packages/yew-macro/src/props/component.rs @@ -30,7 +30,7 @@ impl Parse for BaseExpr { impl ToTokens for BaseExpr { fn to_tokens(&self, tokens: &mut TokenStream) { let BaseExpr { dot2, expr } = self; - tokens.extend(quote! { #dot2#expr }); + tokens.extend(quote! { #dot2 #expr }); } } diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 724be9518d1..f44eafdb9bd 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-router-macro" version = "0.16.0" authors = ["Hamza "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 4b85f062bb1..463b0d71bcb 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-router" version = "0.16.0" authors = ["Hamza "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" readme = "README.md" keywords = ["web", "yew", "router"] diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index d1555803204..9dee3e2759f 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "yew" version = "0.19.3" -edition = "2018" +edition = "2021" authors = [ "Denis Kolodin ", "Justin Starry ", diff --git a/tools/changelog/Cargo.toml b/tools/changelog/Cargo.toml index be7869ea850..dc6e32d2938 100644 --- a/tools/changelog/Cargo.toml +++ b/tools/changelog/Cargo.toml @@ -2,7 +2,7 @@ name = "changelog" version = "0.1.0" authors = ["Cecile Tonglet "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tools/website-test/Cargo.toml b/tools/website-test/Cargo.toml index c2d534ed35b..43d17d80a25 100644 --- a/tools/website-test/Cargo.toml +++ b/tools/website-test/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "website-test" version = "0.1.0" -edition = "2018" +edition = "2021" build = "build.rs" publish = false