remove useless phantom field from shared_wrapper and boxed_inline macros

ranfdev · ranfdev · commit c1d6dcdfea9c · 2022-02-22T17:31:35.000+01:00
diff --git a/glib/src/boxed.rs b/glib/src/boxed.rs
@@ -33,15 +33,13 @@ macro_rules! glib_boxed_wrapper {
         #[repr(transparent)]
         $visibility struct $name $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? {
             inner: $crate::boxed::Boxed<$ffi_name, Self>,
-            phantom: std::marker::PhantomData<($($($generic),+)?)>,
         }
 
         impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? std::clone::Clone for $name $(<$($generic),+>)? {
             #[inline]
             fn clone(&self) -> Self {
                 Self {
                     inner: std::clone::Clone::clone(&self.inner),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -145,7 +143,6 @@ macro_rules! glib_boxed_wrapper {
             unsafe fn from_glib_none(ptr: *mut $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_none(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -156,7 +153,6 @@ macro_rules! glib_boxed_wrapper {
             unsafe fn from_glib_none(ptr: *const $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_none(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -167,7 +163,6 @@ macro_rules! glib_boxed_wrapper {
             unsafe fn from_glib_full(ptr: *mut $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_full(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -178,7 +173,6 @@ macro_rules! glib_boxed_wrapper {
             unsafe fn from_glib_full(ptr: *const $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_full(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -190,7 +184,6 @@ macro_rules! glib_boxed_wrapper {
                 $crate::translate::Borrowed::new(
                     Self {
                         inner: $crate::translate::from_glib_borrow::<_, $crate::boxed::Boxed<_, _>>(ptr).into_inner(),
-                        phantom: std::marker::PhantomData,
                     }
                 )
             }
diff --git a/glib/src/shared.rs b/glib/src/shared.rs
@@ -31,15 +31,13 @@ macro_rules! glib_shared_wrapper {
         #[repr(transparent)]
         $visibility struct $name $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? {
             inner: $crate::shared::Shared<$ffi_name, Self>,
-            phantom: std::marker::PhantomData<($($($generic),+)?)>,
         }
 
         impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? std::clone::Clone for $name $(<$($generic),+>)? {
             #[inline]
             fn clone(&self) -> Self {
                 Self {
                     inner: std::clone::Clone::clone(&self.inner),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -146,7 +144,6 @@ macro_rules! glib_shared_wrapper {
             unsafe fn from_glib_none(ptr: *mut $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_none(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -157,7 +154,6 @@ macro_rules! glib_shared_wrapper {
             unsafe fn from_glib_none(ptr: *const $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_none(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -168,7 +164,6 @@ macro_rules! glib_shared_wrapper {
             unsafe fn from_glib_full(ptr: *mut $ffi_name) -> Self {
                 Self {
                     inner: $crate::translate::from_glib_full(ptr),
-                    phantom: std::marker::PhantomData,
                 }
             }
         }
@@ -180,7 +175,6 @@ macro_rules! glib_shared_wrapper {
                 $crate::translate::Borrowed::new(
                     Self {
                         inner: $crate::translate::from_glib_borrow::<_, $crate::shared::Shared<_, _>>(ptr).into_inner(),
-                        phantom: std::marker::PhantomData,
                     }
                 )
             }

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,13 @@ macro_rules! glib_boxed_wrapper {`
`33`	`33`	`#[repr(transparent)]`
`34`	`34`	`$visibility struct $name $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? {`
`35`	`35`	`inner: $crate::boxed::Boxed<$ffi_name, Self>,`
`36`		`- phantom: std::marker::PhantomData<($($($generic),+)?)>,`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? std::clone::Clone for $name $(<$($generic),+>)? {`
`40`	`39`	`#[inline]`
`41`	`40`	`fn clone(&self) -> Self {`
`42`	`41`	`Self {`
`43`	`42`	`inner: std::clone::Clone::clone(&self.inner),`
`44`		`- phantom: std::marker::PhantomData,`
`45`	`43`	`}`
`46`	`44`	`}`
`47`	`45`	`}`
`@@ -145,7 +143,6 @@ macro_rules! glib_boxed_wrapper {`
`145`	`143`	`unsafe fn from_glib_none(ptr: *mut $ffi_name) -> Self {`
`146`	`144`	`Self {`
`147`	`145`	`inner: $crate::translate::from_glib_none(ptr),`
`148`		`- phantom: std::marker::PhantomData,`
`149`	`146`	`}`
`150`	`147`	`}`
`151`	`148`	`}`
`@@ -156,7 +153,6 @@ macro_rules! glib_boxed_wrapper {`
`156`	`153`	`unsafe fn from_glib_none(ptr: *const $ffi_name) -> Self {`
`157`	`154`	`Self {`
`158`	`155`	`inner: $crate::translate::from_glib_none(ptr),`
`159`		`- phantom: std::marker::PhantomData,`
`160`	`156`	`}`
`161`	`157`	`}`
`162`	`158`	`}`
`@@ -167,7 +163,6 @@ macro_rules! glib_boxed_wrapper {`
`167`	`163`	`unsafe fn from_glib_full(ptr: *mut $ffi_name) -> Self {`
`168`	`164`	`Self {`
`169`	`165`	`inner: $crate::translate::from_glib_full(ptr),`
`170`		`- phantom: std::marker::PhantomData,`
`171`	`166`	`}`
`172`	`167`	`}`
`173`	`168`	`}`
`@@ -178,7 +173,6 @@ macro_rules! glib_boxed_wrapper {`
`178`	`173`	`unsafe fn from_glib_full(ptr: *const $ffi_name) -> Self {`
`179`	`174`	`Self {`
`180`	`175`	`inner: $crate::translate::from_glib_full(ptr),`
`181`		`- phantom: std::marker::PhantomData,`
`182`	`176`	`}`
`183`	`177`	`}`
`184`	`178`	`}`
`@@ -190,7 +184,6 @@ macro_rules! glib_boxed_wrapper {`
`190`	`184`	`$crate::translate::Borrowed::new(`
`191`	`185`	`Self {`
`192`	`186`	`inner: $crate::translate::from_glib_borrow::<_, $crate::boxed::Boxed<_, _>>(ptr).into_inner(),`
`193`		`- phantom: std::marker::PhantomData,`
`194`	`187`	`}`
`195`	`188`	`)`
`196`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,13 @@ macro_rules! glib_shared_wrapper {`
`31`	`31`	`#[repr(transparent)]`
`32`	`32`	`$visibility struct $name $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? {`
`33`	`33`	`inner: $crate::shared::Shared<$ffi_name, Self>,`
`34`		`- phantom: std::marker::PhantomData<($($($generic),+)?)>,`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`impl $(<$($generic $(: $bound $(+ $bound2)*)?),+>)? std::clone::Clone for $name $(<$($generic),+>)? {`
`38`	`37`	`#[inline]`
`39`	`38`	`fn clone(&self) -> Self {`
`40`	`39`	`Self {`
`41`	`40`	`inner: std::clone::Clone::clone(&self.inner),`
`42`		`- phantom: std::marker::PhantomData,`
`43`	`41`	`}`
`44`	`42`	`}`
`45`	`43`	`}`
`@@ -146,7 +144,6 @@ macro_rules! glib_shared_wrapper {`
`146`	`144`	`unsafe fn from_glib_none(ptr: *mut $ffi_name) -> Self {`
`147`	`145`	`Self {`
`148`	`146`	`inner: $crate::translate::from_glib_none(ptr),`
`149`		`- phantom: std::marker::PhantomData,`
`150`	`147`	`}`
`151`	`148`	`}`
`152`	`149`	`}`
`@@ -157,7 +154,6 @@ macro_rules! glib_shared_wrapper {`
`157`	`154`	`unsafe fn from_glib_none(ptr: *const $ffi_name) -> Self {`
`158`	`155`	`Self {`
`159`	`156`	`inner: $crate::translate::from_glib_none(ptr),`
`160`		`- phantom: std::marker::PhantomData,`
`161`	`157`	`}`
`162`	`158`	`}`
`163`	`159`	`}`
`@@ -168,7 +164,6 @@ macro_rules! glib_shared_wrapper {`
`168`	`164`	`unsafe fn from_glib_full(ptr: *mut $ffi_name) -> Self {`
`169`	`165`	`Self {`
`170`	`166`	`inner: $crate::translate::from_glib_full(ptr),`
`171`		`- phantom: std::marker::PhantomData,`
`172`	`167`	`}`
`173`	`168`	`}`
`174`	`169`	`}`
`@@ -180,7 +175,6 @@ macro_rules! glib_shared_wrapper {`
`180`	`175`	`$crate::translate::Borrowed::new(`
`181`	`176`	`Self {`
`182`	`177`	`inner: $crate::translate::from_glib_borrow::<_, $crate::shared::Shared<_, _>>(ptr).into_inner(),`
`183`		`- phantom: std::marker::PhantomData,`
`184`	`178`	`}`
`185`	`179`	`)`
`186`	`180`	`}`