Simpler code generation (#3370)

microsoft · Dec 10, 2024 · 350014d · 350014d
1 parent 2dffc99
commit 350014d
Show file tree

Hide file tree

Showing 272 changed files with 6 additions and 55,289 deletions.
diff --git a/crates/libs/bindgen/src/types/cpp_fn.rs b/crates/libs/bindgen/src/types/cpp_fn.rs
@@ -228,18 +228,6 @@ impl CppFn {
                     }
                 }
             }
-            ReturnHint::ReturnVoid => {
-                let where_clause = method.write_where(writer, false);
-
-                quote! {
-                    #cfg
-                    #[inline]
-                    pub unsafe fn #name<#generics>(#params) #abi_return_type #where_clause {
-                        #link
-                        #name(#args)
-                    }
-                }
-            }
         };
 
         quote! {

diff --git a/crates/libs/bindgen/src/types/cpp_method.rs b/crates/libs/bindgen/src/types/cpp_method.rs
@@ -18,7 +18,6 @@ pub enum ReturnHint {
     ResultVoid,
     ReturnStruct,
     ReturnValue,
-    ReturnVoid,
 }
 
 #[derive(Copy, Clone, PartialEq, Debug)]
@@ -187,12 +186,9 @@ impl CppMethod {
             false
         };
 
-        // TODO: ignore this attribute and just return HRESULT/BOOL/NTSTATUS/whatever and let the caller user `.ok()` if
-        // they want to treat it as a Result with a single success value.
         if !def.has_attribute("CanReturnMultipleSuccessValuesAttribute") {
             match &signature.return_type.0 {
                 Type::Void if is_retval => return_hint = ReturnHint::ReturnValue,
-                Type::Void => return_hint = ReturnHint::ReturnVoid,
                 Type::HRESULT => {
                     if is_retval {
                         return_hint = ReturnHint::ResultValue
@@ -283,6 +279,7 @@ impl CppMethod {
         let args = self.write_args();
         let params = self.write_params(writer);
         let generics = self.write_generics();
+        let abi_return_type = self.write_return(writer);
 
         match self.return_hint {
             ReturnHint::Query(..) => {
@@ -386,24 +383,14 @@ impl CppMethod {
                 }
             }
             ReturnHint::None => {
-                let return_type = self.signature.return_type.0.write_default(writer);
                 let where_clause = self.write_where(writer, false);
 
                 quote! {
-                    pub unsafe fn #name<#generics>(&self, #params) -> #return_type #where_clause {
+                    pub unsafe fn #name<#generics>(&self, #params) #abi_return_type #where_clause {
                         (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self), #args)
                     }
                 }
             }
-            ReturnHint::ReturnVoid => {
-                let where_clause = self.write_where(writer, false);
-
-                quote! {
-                    pub unsafe fn #name<#generics>(&self, #params) #where_clause {
-                        (windows_core::Interface::vtable(self).#vname)(windows_core::Interface::as_raw(self),#args)
-                    }
-                }
-            }
         }
     }
 
@@ -494,7 +481,6 @@ impl CppMethod {
         }
 
         let return_type = match self.return_hint {
-            ReturnHint::ReturnVoid => quote! {},
             ReturnHint::Query(..) | ReturnHint::QueryOptional(..) | ReturnHint::ResultVoid => {
                 quote! { -> windows_core::Result<()> }
             }

diff --git a/crates/libs/bindgen/src/types/cpp_struct.rs b/crates/libs/bindgen/src/types/cpp_struct.rs
@@ -146,24 +146,6 @@ impl CppStruct {
             derive.extend(["Debug", "PartialEq"]);
         }
 
-        let type_kind = if writer.config.sys {
-            quote! {}
-        } else if is_copyable {
-            quote! {
-               #cfg
-               impl windows_core::TypeKind for #name {
-                   type TypeKind = windows_core::CopyType;
-               }
-            }
-        } else {
-            quote! {
-               #cfg
-               impl windows_core::TypeKind for #name {
-                   type TypeKind = windows_core::CloneType;
-               }
-            }
-        };
-
         let default = if writer.config.sys {
             quote! {}
         } else {
@@ -230,7 +212,6 @@ impl CppStruct {
             #constants
             #manual_clone
             #default
-            #type_kind
         };
 
         for nested in self.nested.values() {

diff --git a/crates/libs/windows/src/Windows/Wdk/Devices/HumanInterfaceDevice/mod.rs b/crates/libs/windows/src/Windows/Wdk/Devices/HumanInterfaceDevice/mod.rs
@@ -41,9 +41,6 @@ impl Default for HID_XFER_PACKET {
         unsafe { core::mem::zeroed() }
     }
 }
-impl windows_core::TypeKind for HID_XFER_PACKET {
-    type TypeKind = windows_core::CopyType;
-}
 #[repr(C)]
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct VHF_CONFIG {
@@ -73,6 +70,3 @@ impl Default for VHF_CONFIG {
         unsafe { core::mem::zeroed() }
     }
 }
-impl windows_core::TypeKind for VHF_CONFIG {
-    type TypeKind = windows_core::CopyType;
-}