Derive PartialEq, Eq, Debug, Clone for interfaces (#2651)

microsoft · Sep 12, 2023 · 132fb5b · 132fb5b
1 parent 17110d4
commit 132fb5b
Show file tree

Hide file tree

Showing 502 changed files with 15,955 additions and 202,111 deletions.
diff --git a/crates/libs/bindgen/src/rust/classes.rs b/crates/libs/bindgen/src/rust/classes.rs
@@ -86,6 +86,7 @@ fn gen_class(writer: &Writer, def: TypeDef) -> TokenStream {
             #doc
             #features
             #[repr(transparent)]
+            #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)]
             pub struct #name(::windows_core::IUnknown);
             #features
             impl #name {
@@ -95,7 +96,6 @@ fn gen_class(writer: &Writer, def: TypeDef) -> TokenStream {
             }
         };
 
-        tokens.combine(&writer.interface_core_traits(def, &[], &name, &TokenStream::new(), &TokenStream::new(), &features));
         tokens.combine(&writer.interface_winrt_trait(def, &[], &name, &TokenStream::new(), &TokenStream::new(), &features));
         tokens.combine(&writer.interface_trait(def, &[], &name, &TokenStream::new(), &features, true));
         tokens.combine(&writer.runtime_name_trait(def, &[], &name, &TokenStream::new(), &features));

diff --git a/crates/libs/bindgen/src/rust/delegates.rs b/crates/libs/bindgen/src/rust/delegates.rs
@@ -72,6 +72,7 @@ fn gen_win_delegate(writer: &Writer, def: TypeDef) -> TokenStream {
         #doc
         #features
         #[repr(transparent)]
+        #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)]
         pub struct #ident(pub ::windows_core::IUnknown, #phantoms) where #constraints;
         #features
         impl<#constraints> #ident {
@@ -142,7 +143,6 @@ fn gen_win_delegate(writer: &Writer, def: TypeDef) -> TokenStream {
         }
     };
 
-    tokens.combine(&writer.interface_core_traits(def, generics, &ident, &constraints, &phantoms, &features));
     tokens.combine(&writer.interface_trait(def, generics, &ident, &constraints, &features, true));
     tokens.combine(&writer.interface_winrt_trait(def, generics, &ident, &constraints, &phantoms, &features));
     tokens.combine(&writer.interface_vtbl(def, generics, &ident, &constraints, &features));

diff --git a/crates/libs/bindgen/src/rust/interfaces.rs b/crates/libs/bindgen/src/rust/interfaces.rs
@@ -44,12 +44,14 @@ fn gen_win_interface(writer: &Writer, def: TypeDef) -> TokenStream {
         tokens.combine(&quote! {
             #features
             #[repr(transparent)]
+            #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)]
             pub struct #ident(::windows_core::IUnknown, #phantoms) where #constraints;
         });
     } else {
         tokens.combine(&quote! {
             #features
             #[repr(transparent)]
+            #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)]
             pub struct #ident(::std::ptr::NonNull<::std::ffi::c_void>);
         });
     }
@@ -136,7 +138,6 @@ fn gen_win_interface(writer: &Writer, def: TypeDef) -> TokenStream {
             }
         }
 
-        tokens.combine(&writer.interface_core_traits(def, generics, &ident, &constraints, &phantoms, &features));
         tokens.combine(&writer.interface_winrt_trait(def, generics, &ident, &constraints, &phantoms, &features));
         tokens.combine(&writer.async_get(def, generics, &ident, &constraints, &phantoms, &features));
         tokens.combine(&iterators::writer(writer, def, generics, &ident, &constraints, &phantoms, &cfg));

diff --git a/crates/libs/bindgen/src/rust/writer.rs b/crates/libs/bindgen/src/rust/writer.rs
@@ -537,25 +537,6 @@ impl<'a> Writer<'a> {
         let guid = self.type_name(&Type::GUID);
         format!("{}::from_u128(0x{:08x?}_{:04x?}_{:04x?}_{:02x?}{:02x?}_{:02x?}{:02x?}{:02x?}{:02x?}{:02x?}{:02x?})", guid.into_string(), value.0, value.1, value.2, value.3, value.4, value.5, value.6, value.7, value.8, value.9, value.10).into()
     }
-    pub fn interface_core_traits(&self, def: TypeDef, _generics: &[Type], ident: &TokenStream, constraints: &TokenStream, _phantoms: &TokenStream, features: &TokenStream) -> TokenStream {
-        let name = crate::trim_tick(self.reader.type_def_name(def));
-        quote! {
-            #features
-            impl<#constraints> ::core::cmp::PartialEq for #ident {
-                fn eq(&self, other: &Self) -> bool {
-                    self.0 == other.0
-                }
-            }
-            #features
-            impl<#constraints> ::core::cmp::Eq for #ident {}
-            #features
-            impl<#constraints> ::core::fmt::Debug for #ident {
-                fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
-                    f.debug_tuple(#name).field(&self.0).finish()
-                }
-            }
-        }
-    }
     pub fn agile(&self, def: TypeDef, ident: &TokenStream, constraints: &TokenStream, features: &TokenStream) -> TokenStream {
         if type_def_is_agile(self.reader, def) {
             quote! {
@@ -718,12 +699,6 @@ impl<'a> Writer<'a> {
             let default_name = self.type_name(&default);
             let vtbl = self.type_vtbl_name(&default);
             quote! {
-                #features
-                impl<#constraints> ::core::clone::Clone for #ident {
-                    fn clone(&self) -> Self {
-                        Self(self.0.clone())
-                    }
-                }
                 #features
                 unsafe impl ::windows_core::Interface for #ident {
                     type Vtable = #vtbl;
@@ -750,19 +725,11 @@ impl<'a> Writer<'a> {
                 }
             };
 
-            let phantoms = self.generic_phantoms(generics);
-
             let mut tokens = quote! {
                 #features
                 unsafe impl<#constraints> ::windows_core::Interface for #ident {
                     type Vtable = #vtbl;
                 }
-                #features
-                impl<#constraints> ::core::clone::Clone for #ident {
-                    fn clone(&self) -> Self {
-                        Self(self.0.clone(), #phantoms)
-                    }
-                }
             };
 
             if has_unknown_base {