Merge pull request #1068 from felinira/properties-specificity

sdroege · web-flow · commit 7f9a20b090fc · 2023-04-02T10:22:07.000+03:00
glib-macros: Specify quoted types explicitly
diff --git a/glib-macros/src/boxed_derive.rs b/glib-macros/src/boxed_derive.rs
@@ -9,8 +9,8 @@ use crate::utils::{crate_ident_new, find_attribute_meta, find_nested_meta, parse
 fn gen_option_to_ptr() -> TokenStream {
     quote! {
         match s {
-            Some(s) => ::std::boxed::Box::into_raw(::std::boxed::Box::new(s.clone())),
-            None => ::std::ptr::null_mut(),
+            ::core::option::Option::Some(s) => ::std::boxed::Box::into_raw(::std::boxed::Box::new(s.clone())),
+            ::core::option::Option::None => ::std::ptr::null_mut(),
         };
     }
 }
@@ -122,7 +122,7 @@ pub fn impl_boxed(input: &syn::DeriveInput) -> TokenStream {
 
     quote! {
         impl #crate_ident::subclass::boxed::BoxedType for #name {
-            const NAME: &'static str = #gtype_name;
+            const NAME: &'static ::core::primitive::str = #gtype_name;
         }
 
         impl #crate_ident::StaticType for #name {
@@ -247,7 +247,7 @@ pub fn impl_boxed(input: &syn::DeriveInput) -> TokenStream {
         impl #crate_ident::HasParamSpec for #name {
             type ParamSpec = #crate_ident::ParamSpecBoxed;
             type SetValue = Self;
-            type BuilderFn = fn(&str) -> #crate_ident::ParamSpecBoxedBuilder<Self>;
+            type BuilderFn = fn(&::core::primitive::str) -> #crate_ident::ParamSpecBoxedBuilder<Self>;
 
             fn param_spec_builder() -> Self::BuilderFn {
                 |name| Self::ParamSpec::builder(name)
diff --git a/glib-macros/src/downgrade_derive/enums.rs b/glib-macros/src/downgrade_derive/enums.rs
@@ -130,7 +130,7 @@ pub fn derive_downgrade_for_enum(
             type Strong = #ident #generics;
 
             fn upgrade(&self) -> ::core::option::Option<Self::Strong> {
-                Some(match self {#(
+                ::core::option::Option::Some(match self {#(
                     #upgrade_variants
                 ),*})
             }
diff --git a/glib-macros/src/downgrade_derive/structs.rs b/glib-macros/src/downgrade_derive/structs.rs
@@ -114,7 +114,7 @@ pub fn derive_downgrade_for_struct(
 
             fn upgrade(&self) -> ::core::option::Option<Self::Strong> {
                 let Self #destruct = self;
-                Some(#ident #upgrade)
+                ::core::option::Option::Some(#ident #upgrade)
             }
         }
     };
diff --git a/glib-macros/src/enum_derive.rs b/glib-macros/src/enum_derive.rs
@@ -193,7 +193,7 @@ pub fn impl_enum(input: &syn::DeriveInput) -> TokenStream {
         impl #crate_ident::HasParamSpec for #name {
             type ParamSpec = #crate_ident::ParamSpecEnum;
             type SetValue = Self;
-            type BuilderFn = fn(&str, Self) -> #crate_ident::ParamSpecEnumBuilder<Self>;
+            type BuilderFn = fn(&::core::primitive::str, Self) -> #crate_ident::ParamSpecEnumBuilder<Self>;
 
             fn param_spec_builder() -> Self::BuilderFn {
                 |name, default_value| Self::ParamSpec::builder_with_default(name, default_value)
diff --git a/glib-macros/src/error_domain_derive.rs b/glib-macros/src/error_domain_derive.rs
@@ -35,7 +35,7 @@ pub fn impl_error_domain(input: &syn::DeriveInput) -> TokenStream {
 
                 static QUARK: #crate_ident::once_cell::sync::Lazy<#crate_ident::Quark> =
                     #crate_ident::once_cell::sync::Lazy::new(|| unsafe {
-                        from_glib(#crate_ident::ffi::g_quark_from_static_string(concat!(#domain_name, "\0") as *const str as *const _))
+                        from_glib(#crate_ident::ffi::g_quark_from_static_string(concat!(#domain_name, "\0") as *const ::core::primitive::str as *const _))
                     });
                 *QUARK
             }
@@ -48,7 +48,7 @@ pub fn impl_error_domain(input: &syn::DeriveInput) -> TokenStream {
             #[inline]
             fn from(value: i32) -> ::core::option::Option<Self>
             where
-                Self: Sized
+                Self: ::std::marker::Sized
             {
                 #from_glib
             }
diff --git a/glib-macros/src/flags_attribute.rs b/glib-macros/src/flags_attribute.rs
@@ -182,7 +182,7 @@ pub fn impl_flags(attrs: &NestedMeta, input: &DeriveInput) -> TokenStream {
         impl #crate_ident::HasParamSpec for #name {
             type ParamSpec = #crate_ident::ParamSpecFlags;
             type SetValue = Self;
-            type BuilderFn = fn(&str) -> #crate_ident::ParamSpecFlagsBuilder<Self>;
+            type BuilderFn = fn(&::core::primitive::str) -> #crate_ident::ParamSpecFlagsBuilder<Self>;
 
             fn param_spec_builder() -> Self::BuilderFn {
                 |name| Self::ParamSpec::builder(name)
diff --git a/glib-macros/src/properties.rs b/glib-macros/src/properties.rs
@@ -525,7 +525,7 @@ fn expand_wrapper_getset_properties(props: &[PropDesc]) -> TokenStream2 {
             let ident = format_ident!("set_{}", ident);
             let target_ty = quote!(<<#ty as #crate_ident::Property>::Value as #crate_ident::HasParamSpec>::SetValue);
             let set_ty = if p.nullable {
-               quote!(Option<impl std::borrow::Borrow<#target_ty>>)
+               quote!(::core::option::Option<impl std::borrow::Borrow<#target_ty>>)
             } else {
                quote!(impl std::borrow::Borrow<#target_ty>)
             };
@@ -558,7 +558,7 @@ fn expand_wrapper_connect_prop_notify(props: &[PropDesc]) -> TokenStream2 {
         let fn_ident = format_ident!("connect_{}_notify", name_to_ident(name));
         let span = p.attrs_span;
         quote_spanned!(span=> pub fn #fn_ident<F: Fn(&Self) + 'static>(&self, f: F) -> #crate_ident::SignalHandlerId {
-            self.connect_notify_local(Some(#name), move |this, _| {
+            self.connect_notify_local(::core::option::Option::Some(#name), move |this, _| {
                 f(this)
             })
         })
@@ -619,10 +619,10 @@ fn expand_properties_enum(props: &[PropDesc]) -> TokenStream2 {
         impl std::convert::TryFrom<usize> for DerivedPropertiesEnum {
             type Error = usize;
 
-            fn try_from(item: usize) -> Result<Self, Self::Error> {
+            fn try_from(item: usize) -> ::core::result::Result<Self, Self::Error> {
                 match item {
-                    #(#indices => Ok(Self::#properties),)*
-                    _ => Err(item)
+                    #(#indices => ::core::result::Result::Ok(Self::#properties),)*
+                    _ => ::core::result::Result::Err(item)
                 }
             }
         }
diff --git a/glib-macros/src/shared_boxed_derive.rs b/glib-macros/src/shared_boxed_derive.rs
@@ -16,8 +16,8 @@ fn gen_impl_to_value_optional(name: &Ident, crate_ident: &TokenStream) -> TokenS
                 let mut value = #crate_ident::Value::for_value_type::<Self>();
                 unsafe {
                     let ptr = match s {
-                        Some(s) => #refcounted_type_prefix::into_raw(s.0.clone()),
-                        None => ::std::ptr::null(),
+                        ::core::option::Option::Some(s) => #refcounted_type_prefix::into_raw(s.0.clone()),
+                        ::core::option::Option::None => ::std::ptr::null(),
                     };
 
                     #crate_ident::gobject_ffi::g_value_take_boxed(
@@ -133,7 +133,7 @@ pub fn impl_shared_boxed(input: &syn::DeriveInput) -> proc_macro2::TokenStream {
 
     quote! {
         impl #crate_ident::subclass::shared::SharedType for #name {
-            const NAME: &'static str = #gtype_name;
+            const NAME: &'static ::core::primitive::str = #gtype_name;
 
             type RefCountedType = #refcounted_type;
 
@@ -278,7 +278,7 @@ pub fn impl_shared_boxed(input: &syn::DeriveInput) -> proc_macro2::TokenStream {
         impl #crate_ident::HasParamSpec for #name {
             type ParamSpec = #crate_ident::ParamSpecBoxed;
             type SetValue = Self;
-            type BuilderFn = fn(&str) -> #crate_ident::ParamSpecBoxedBuilder<Self>;
+            type BuilderFn = fn(&::core::primitive::str) -> #crate_ident::ParamSpecBoxedBuilder<Self>;
 
             fn param_spec_builder() -> Self::BuilderFn {
                 |name| Self::ParamSpec::builder(name)
diff --git a/glib-macros/src/utils.rs b/glib-macros/src/utils.rs
@@ -153,12 +153,12 @@ pub fn gen_enum_from_glib(
         let name = &v.ident;
         quote_spanned! { v.span() =>
             if value == #enum_name::#name as i32 {
-                return Some(#enum_name::#name);
+                return ::core::option::Option::Some(#enum_name::#name);
             }
         }
     });
     quote! {
         #(#recurse)*
-        None
+        ::core::option::Option::None
     }
 }
diff --git a/glib-macros/src/value_delegate_derive.rs b/glib-macros/src/value_delegate_derive.rs
@@ -132,11 +132,11 @@ pub fn impl_value_delegate(input: ValueDelegateInput) -> syn::Result<proc_macro:
     let to_value_optional = nullable.then(|| {
         quote! {
             impl #crate_ident::value::ToValueOptional for #ident {
-                fn to_value_optional(s: Option<&Self>) -> #crate_ident::value::Value {
-                    if let Some(this) = s {
-                        #crate_ident::value::ToValue::to_value(&Some(&#delegate_value))
+                fn to_value_optional(s: ::core::option::Option<&Self>) -> #crate_ident::value::Value {
+                    if let ::core::option::Option::Some(this) = s {
+                        #crate_ident::value::ToValue::to_value(&::core::option::Option::Some(&#delegate_value))
                     } else {
-                        #crate_ident::value::ToValueOptional::to_value_optional(None::<&#delegated_ty>)
+                        #crate_ident::value::ToValueOptional::to_value_optional(::core::option::Option::None::<&#delegated_ty>)
                     }
                 }
             }
diff --git a/glib-macros/src/variant_derive.rs b/glib-macros/src/variant_derive.rs
@@ -99,13 +99,13 @@ fn derive_variant_for_struct(
                 impl #impl_generics #glib::FromVariant for #ident #type_generics #where_clause {
                     fn from_variant(variant: &#glib::Variant) -> ::core::option::Option<Self> {
                         if !variant.is_container() {
-                            return None;
+                            return ::core::option::Option::None;
                         }
-                        Some(Self(
+                        ::core::option::Option::Some(Self(
                             #(
                                 match variant.try_child_get::<#types>(#idents) {
-                                    Ok(Some(field)) => field,
-                                    _ => return None,
+                                    ::core::result::Result::Ok(::core::option::Option::Some(field)) => field,
+                                    _ => return ::core::option::Option::None,
                                 }
                             ),*
                         ))
@@ -182,13 +182,13 @@ fn derive_variant_for_struct(
                 impl #impl_generics #glib::FromVariant for #ident #type_generics #where_clause {
                     fn from_variant(variant: &#glib::Variant) -> ::core::option::Option<Self> {
                         if !variant.is_container() {
-                            return None;
+                            return ::core::option::Option::None;
                         }
-                        Some(Self {
+                        ::core::option::Option::Some(Self {
                             #(
                                 #idents: match variant.try_child_get::<#types>(#counts) {
-                                    Ok(Some(field)) => field,
-                                    _ => return None,
+                                    ::core::result::Result::Ok(::core::option::Option::Some(field)) => field,
+                                    _ => return ::core::option::Option::None,
                                 }
                             ),*
                         })
@@ -227,7 +227,7 @@ fn derive_variant_for_struct(
             let from_variant = quote! {
                 impl #impl_generics #glib::FromVariant for #ident #type_generics #where_clause {
                     fn from_variant(variant: &#glib::Variant) -> ::core::option::Option<Self> {
-                        Some(Self)
+                        ::core::option::Option::Some(Self)
                     }
                 }
             };
@@ -421,13 +421,13 @@ fn derive_variant_for_enum(
                         )?
                     }
                 });
-                quote! { #tag => ::std::option::Option::Some(Self::#ident { #(#fields),* }), }
+                quote! { #tag => ::core::option::Option::Some(Self::#ident { #(#fields),* }), }
             }
             syn::Fields::Unnamed(FieldsUnnamed { unnamed, .. }) => {
                 let indices = 0..unnamed.iter().count();
                 let repr = unnamed.iter().map(|f| &f.ty);
                 quote! {
-                    #tag => ::std::option::Option::Some(Self::#ident(
+                    #tag => ::core::option::Option::Some(Self::#ident(
                         #(
                             <#repr as #glib::FromVariant>::from_variant(
                                 &#glib::Variant::try_child_value(&value, #indices)?
@@ -437,7 +437,7 @@ fn derive_variant_for_enum(
                 }
             }
             syn::Fields::Unit => {
-                quote! { #tag => ::std::option::Option::Some(Self::#ident), }
+                quote! { #tag => ::core::option::Option::Some(Self::#ident), }
             }
         }
     });
@@ -477,14 +477,14 @@ fn derive_variant_for_enum(
         }
 
         impl #impl_generics #glib::FromVariant for #ident #type_generics #where_clause {
-            fn from_variant(variant: &#glib::Variant) -> ::std::option::Option<Self> {
+            fn from_variant(variant: &#glib::Variant) -> ::core::option::Option<Self> {
                 let (tag, value) = <(#repr, #glib::Variant) as #glib::FromVariant>::from_variant(&variant)?;
                 if !#glib::VariantTy::is_tuple(#glib::Variant::type_(&value)) {
-                    return ::std::option::Option::None;
+                    return ::core::option::Option::None;
                 }
                 match #tag_match {
                     #(#from)*
-                    _ => ::std::option::Option::None
+                    _ => ::core::option::Option::None
                 }
             }
         }
@@ -520,8 +520,8 @@ fn derive_variant_for_c_enum(
                 quote! {
                     let tag = #glib::Variant::str(&variant)?;
                     match tag {
-                        #(#nicks2 => ::std::option::Option::Some(Self::#idents2),)*
-                        _ => ::std::option::Option::None
+                        #(#nicks2 => ::core::option::Option::Some(Self::#idents2),)*
+                        _ => ::core::option::Option::None
                     }
                 },
             )
@@ -535,9 +535,9 @@ fn derive_variant_for_c_enum(
                 quote! {
                     let value = <#repr as #glib::FromVariant>::from_variant(&variant)?;
                     #(if value == Self::#idents as #repr {
-                        return Some(Self::#idents);
+                        return ::core::option::Option::Some(Self::#idents);
                     })*
-                    None
+                    ::core::option::Option::None
                 },
             )
         }
@@ -554,10 +554,10 @@ fn derive_variant_for_c_enum(
             quote! {
                 let ty = <Self as #glib::StaticType>::static_type();
                 let enum_class = #glib::EnumClass::new(ty);
-                let enum_class = ::std::option::Option::unwrap(enum_class);
+                let enum_class = ::core::option::Option::unwrap(enum_class);
                 let value = <Self as #glib::translate::IntoGlib>::into_glib(*self);
                 let value = #glib::EnumClass::value(&enum_class, value);
-                let value = ::std::option::Option::unwrap(value);
+                let value = ::core::option::Option::unwrap(value);
                 let nick = #glib::EnumValue::nick(&value);
                 #glib::ToVariant::to_variant(nick)
             },
@@ -583,7 +583,7 @@ fn derive_variant_for_c_enum(
             quote! {
                 let ty = <Self as #glib::StaticType>::static_type();
                 let flags_class = #glib::FlagsClass::new(ty);
-                let flags_class = ::std::option::Option::unwrap(flags_class);
+                let flags_class = ::core::option::Option::unwrap(flags_class);
                 let value = <Self as #glib::translate::IntoGlib>::into_glib(*self);
                 let s = #glib::FlagsClass::to_nick_string(&flags_class, value);
                 #glib::ToVariant::to_variant(&s)
@@ -593,7 +593,7 @@ fn derive_variant_for_c_enum(
                 let flags_class = #glib::FlagsClass::new(ty)?;
                 let s = #glib::Variant::str(&variant)?;
                 let value = #glib::FlagsClass::from_nick_string(&flags_class, s).ok()?;
-                Some(unsafe { #glib::translate::from_glib(value) })
+                ::core::option::Option::Some(unsafe { #glib::translate::from_glib(value) })
             },
         ),
     };
@@ -624,7 +624,7 @@ fn derive_variant_for_c_enum(
         }
 
         impl #impl_generics #glib::FromVariant for #ident #type_generics #where_clause {
-            fn from_variant(variant: &#glib::Variant) -> ::std::option::Option<Self> {
+            fn from_variant(variant: &#glib::Variant) -> ::core::option::Option<Self> {
                 #from_variant
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ pub fn derive_downgrade_for_enum(`
`130`	`130`	`type Strong = #ident #generics;`
`131`	`131`
`132`	`132`	`fn upgrade(&self) -> ::core::option::Option<Self::Strong> {`
`133`		`- Some(match self {#(`
	`133`	`+ ::core::option::Option::Some(match self {#(`
`134`	`134`	`#upgrade_variants`
`135`	`135`	`),*})`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ pub fn derive_downgrade_for_struct(`
`114`	`114`
`115`	`115`	`fn upgrade(&self) -> ::core::option::Option<Self::Strong> {`
`116`	`116`	`let Self #destruct = self;`
`117`		`- Some(#ident #upgrade)`
	`117`	`+ ::core::option::Option::Some(#ident #upgrade)`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`};`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ pub fn impl_error_domain(input: &syn::DeriveInput) -> TokenStream {`
`35`	`35`
`36`	`36`	`static QUARK: #crate_ident::once_cell::sync::Lazy<#crate_ident::Quark> =`
`37`	`37`	`#crate_ident::once_cell::sync::Lazy::new(\|\| unsafe {`
`38`		`- from_glib(#crate_ident::ffi::g_quark_from_static_string(concat!(#domain_name, "\0") as const str as const _))`
	`38`	`+ from_glib(#crate_ident::ffi::g_quark_from_static_string(concat!(#domain_name, "\0") as const ::core::primitive::str as const _))`
`39`	`39`	`});`
`40`	`40`	`*QUARK`
`41`	`41`	`}`
`@@ -48,7 +48,7 @@ pub fn impl_error_domain(input: &syn::DeriveInput) -> TokenStream {`
`48`	`48`	`#[inline]`
`49`	`49`	`fn from(value: i32) -> ::core::option::Option<Self>`
`50`	`50`	`where`
`51`		`- Self: Sized`
	`51`	`+ Self: ::std::marker::Sized`
`52`	`52`	`{`
`53`	`53`	`#from_glib`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,12 @@ pub fn gen_enum_from_glib(`
`153`	`153`	`let name = &v.ident;`
`154`	`154`	`quote_spanned! { v.span() =>`
`155`	`155`	`if value == #enum_name::#name as i32 {`
`156`		`- return Some(#enum_name::#name);`
	`156`	`+ return ::core::option::Option::Some(#enum_name::#name);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`});`
`160`	`160`	`quote! {`
`161`	`161`	`#(#recurse)*`
`162`		`- None`
	`162`	`+ ::core::option::Option::None`
`163`	`163`	`}`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,11 @@ pub fn impl_value_delegate(input: ValueDelegateInput) -> syn::Result<proc_macro:`
`132`	`132`	`let to_value_optional = nullable.then(\|\| {`
`133`	`133`	`quote! {`
`134`	`134`	`impl #crate_ident::value::ToValueOptional for #ident {`
`135`		`- fn to_value_optional(s: Option<&Self>) -> #crate_ident::value::Value {`
`136`		`- if let Some(this) = s {`
`137`		`- #crate_ident::value::ToValue::to_value(&Some(&#delegate_value))`
	`135`	`+ fn to_value_optional(s: ::core::option::Option<&Self>) -> #crate_ident::value::Value {`
	`136`	`+ if let ::core::option::Option::Some(this) = s {`
	`137`	`+ #crate_ident::value::ToValue::to_value(&::core::option::Option::Some(&#delegate_value))`
`138`	`138`	`} else {`
`139`		`- #crate_ident::value::ToValueOptional::to_value_optional(None::<&#delegated_ty>)`
	`139`	`+ #crate_ident::value::ToValueOptional::to_value_optional(::core::option::Option::None::<&#delegated_ty>)`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`}`