diff --git a/packages/fullstack/server-macro/src/lib.rs b/packages/fullstack/server-macro/src/lib.rs index 1829a4037..a6b9f6e22 100644 --- a/packages/fullstack/server-macro/src/lib.rs +++ b/packages/fullstack/server-macro/src/lib.rs @@ -85,10 +85,7 @@ pub fn server(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream { // extract all #[middleware] attributes let mut middlewares: Vec = vec![]; - function.attrs = function - .attrs - .into_iter() - .filter(|attr| { + function.attrs.retain(|attr| { if attr.meta.path().is_ident("middleware") { if let Ok(middleware) = attr.parse_args() { middlewares.push(middleware); @@ -99,8 +96,7 @@ pub fn server(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream { } else { true } - }) - .collect(); + }); let ItemFn { attrs, @@ -137,7 +133,7 @@ pub fn server(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream { match server_macro_impl( quote::quote!(#args), mapped_body, - trait_obj_wrapper.clone(), + trait_obj_wrapper, None, Some(server_fn_path.clone()), ) { diff --git a/packages/fullstack/src/props_html/serialize_props.rs b/packages/fullstack/src/props_html/serialize_props.rs index 3ed9332f7..0c6ae3c49 100644 --- a/packages/fullstack/src/props_html/serialize_props.rs +++ b/packages/fullstack/src/props_html/serialize_props.rs @@ -9,7 +9,7 @@ pub(crate) fn serde_to_writable( write_to: &mut impl std::io::Write, ) -> std::io::Result<()> { let serialized = postcard::to_allocvec(value).unwrap(); - write_to.write_all(&STANDARD.encode(serialized).as_bytes())?; + write_to.write_all(STANDARD.encode(serialized).as_bytes())?; Ok(()) } diff --git a/packages/router-macro/src/route.rs b/packages/router-macro/src/route.rs index 3120f4cca..77199d04e 100644 --- a/packages/router-macro/src/route.rs +++ b/packages/router-macro/src/route.rs @@ -117,7 +117,7 @@ impl Route { f.attrs .iter() .any(|attr| attr.path.is_ident("child")) - || f.ident.as_ref().unwrap().to_string() == "child" + || *f.ident.as_ref().unwrap() == "child" }); match child_field{ Some(child) => {