From a66bffb48729a84c31936de5324fd2b4bc48ac07 Mon Sep 17 00:00:00 2001 From: David Bernard Date: Wed, 2 Jul 2025 15:03:13 +0200 Subject: [PATCH] fix: allow to name module `std` in project (#4353) add missing prefix '::' for use of 'core' or 'std' module RELATED #4331 --- packages/const-serialize-macro/src/lib.rs | 4 ++-- packages/router-macro/src/lib.rs | 14 +++++++------- packages/router-macro/src/route.rs | 8 ++++---- packages/router-macro/src/segment.rs | 8 ++++---- packages/wasm-split/wasm-split-macro/src/lib.rs | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/const-serialize-macro/src/lib.rs b/packages/const-serialize-macro/src/lib.rs index b8015bdbc..11997c6b0 100644 --- a/packages/const-serialize-macro/src/lib.rs +++ b/packages/const-serialize-macro/src/lib.rs @@ -175,7 +175,7 @@ pub fn derive_parse(input: TokenStream) -> TokenStream { const_serialize::Layout::Struct(layout) => layout, _ => panic!("VariantStruct::MEMORY_LAYOUT must be a struct"), }, - std::mem::align_of::(), + ::std::mem::align_of::(), ) } } @@ -183,7 +183,7 @@ pub fn derive_parse(input: TokenStream) -> TokenStream { quote! { unsafe impl #impl_generics const_serialize::SerializeConst for #ty #ty_generics #where_clause { const MEMORY_LAYOUT: const_serialize::Layout = const_serialize::Layout::Enum(const_serialize::EnumLayout::new( - std::mem::size_of::(), + ::std::mem::size_of::(), const_serialize::PrimitiveLayout::new( #discriminant_size as usize, ), diff --git a/packages/router-macro/src/lib.rs b/packages/router-macro/src/lib.rs index 3c03378ba..b791df943 100644 --- a/packages/router-macro/src/lib.rs +++ b/packages/router-macro/src/lib.rs @@ -491,7 +491,7 @@ impl RouteEnum { quote! { impl std::fmt::Display for #name { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { #[allow(unused)] match self { #(#display_match)* @@ -514,14 +514,14 @@ impl RouteEnum { quote! { impl<'a> ::core::convert::TryFrom<&'a str> for #name { - type Error = ::Err; + type Error = ::Err; fn try_from(s: &'a str) -> ::std::result::Result { s.parse() } } - impl std::str::FromStr for #name { + impl ::std::str::FromStr for #name { type Err = dioxus_router::routable::RouteParseError<#error_name>; fn from_str(s: &str) -> ::std::result::Result { @@ -646,14 +646,14 @@ impl RouteEnum { #(#error_variants),* } - impl std::fmt::Debug for #match_error_name { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + impl ::std::fmt::Debug for #match_error_name { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { write!(f, "{}({})", stringify!(#match_error_name), self) } } - impl std::fmt::Display for #match_error_name { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + impl ::std::fmt::Display for #match_error_name { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { match self { #(#display_match),* } diff --git a/packages/router-macro/src/route.rs b/packages/router-macro/src/route.rs index 66dc58716..d7b3f1a56 100644 --- a/packages/router-macro/src/route.rs +++ b/packages/router-macro/src/route.rs @@ -180,8 +180,8 @@ impl Route { let child = field.ident.as_ref().unwrap(); quote! { Self::#name { #(#dynamic_segments,)* #child } => { - use std::fmt::Display; - use std::fmt::Write; + use ::std::fmt::Display; + use ::std::fmt::Write; let mut route = String::new(); { let f = &mut route; @@ -334,8 +334,8 @@ impl Route { } } - impl std::fmt::Display for NoPartialEq { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + impl ::std::fmt::Display for NoPartialEq { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { self.0.fmt(f) } } diff --git a/packages/router-macro/src/segment.rs b/packages/router-macro/src/segment.rs index 06f57f707..b33882d18 100644 --- a/packages/router-macro/src/segment.rs +++ b/packages/router-macro/src/segment.rs @@ -314,14 +314,14 @@ pub(crate) fn create_error_type( #(#error_variants,)* } - impl std::fmt::Debug for #error_name { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + impl ::std::fmt::Debug for #error_name { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { write!(f, "{}({})", stringify!(#error_name), self) } } - impl std::fmt::Display for #error_name { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + impl ::std::fmt::Display for #error_name { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { match self { Self::ExtraSegments(segments) => { write!(f, "Found additional trailing segments: {}", segments)? diff --git a/packages/wasm-split/wasm-split-macro/src/lib.rs b/packages/wasm-split/wasm-split-macro/src/lib.rs index 57fa02b93..7a8f6f3cf 100644 --- a/packages/wasm-split/wasm-split-macro/src/lib.rs +++ b/packages/wasm-split/wasm-split-macro/src/lib.rs @@ -25,10 +25,10 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream { desugard_async_sig.asyncness = None; desugard_async_sig.output = match &desugard_async_sig.output { ReturnType::Default => { - parse_quote! { -> std::pin::Pin>> } + parse_quote! { -> ::std::pin::Pin>> } } ReturnType::Type(_, ty) => { - parse_quote! { -> std::pin::Pin>> } + parse_quote! { -> ::std::pin::Pin>> } } };