Consolidate code generation (#2544)

.gitattributes

@@ -3,6 +3,5 @@
 *.png   -text
 *.jpg   -text
 *.winmd -text
-*.dll   -text
 *.lib   -text
 *.a     -text

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,7 +14,7 @@ body:
       options:
         - "windows"
         - "windows-sys"
-        - "windows-bindgen"
+        - "windows-metadata"
         - "windows-core"
         - "windows-targets"
         - "other (please share in the comments)"

.github/workflows/clippy.yml

@@ -134,14 +134,12 @@ jobs:
           cargo clippy -p tool_windows &&
           cargo clippy -p tool_yml &&
           cargo clippy -p windows &&
-          cargo clippy -p windows-bindgen &&
           cargo clippy -p windows-core &&
           cargo clippy -p windows-implement &&
           cargo clippy -p windows-interface &&
           cargo clippy -p windows-metadata &&
           cargo clippy -p windows-sys &&
           cargo clippy -p windows-targets &&
-          cargo clippy -p windows-tokens &&
           cargo clippy -p windows_aarch64_gnullvm &&
           cargo clippy -p windows_aarch64_msvc &&
           cargo clippy -p windows_i686_gnu &&

.github/workflows/test.yml

@@ -96,8 +96,8 @@ jobs:
           cargo test -p test_enums &&
           cargo test -p test_error &&
           cargo test -p test_event &&
-          cargo test -p test_extensions &&
           cargo clean &&
+          cargo test -p test_extensions &&
           cargo test -p test_handles &&
           cargo test -p test_helpers &&
           cargo test -p test_implement &&
@@ -141,14 +141,12 @@ jobs:
           cargo test -p tool_windows &&
           cargo test -p tool_yml &&
           cargo test -p windows &&
-          cargo test -p windows-bindgen &&
           cargo test -p windows-core &&
           cargo test -p windows-implement &&
           cargo test -p windows-interface &&
           cargo test -p windows-metadata &&
           cargo test -p windows-sys &&
           cargo test -p windows-targets &&
-          cargo test -p windows-tokens &&
           cargo test -p windows_aarch64_gnullvm &&
           cargo test -p windows_aarch64_msvc &&
           cargo test -p windows_i686_gnu &&

.gitignore

@@ -1,12 +1,6 @@
 .vscode
 .vs
-.windows
 target
-packages
-obj
-bin
+temp
 *.lock
-*.user
-*.filters
-*.bin
 *.winmd

crates/libs/core/src/imp/bindings.rs

@@ -1,4 +1,4 @@
-// Bindings generated by `windows-bindgen` 0.49.0
+// Bindings generated by `riddle` 0.0.1
 
 #![allow(non_snake_case, non_upper_case_globals, non_camel_case_types, dead_code, clippy::all)]
 ::windows_targets::link!("kernel32.dll" "system" fn CloseHandle(hobject : HANDLE) -> BOOL);

crates/libs/core/src/imp/com_bindings.rs

@@ -1,4 +1,4 @@
-// Bindings generated by `windows-bindgen` 0.49.0
+// Bindings generated by `riddle` 0.0.1
 
 #![allow(non_snake_case, non_upper_case_globals, non_camel_case_types, dead_code, clippy::all)]
 #[inline]

crates/libs/core/src/runtime_type.rs

@@ -2,7 +2,6 @@ use super::*;
 
 #[doc(hidden)]
 pub trait RuntimeType: Type<Self> {
-    // TODO: hidden?
     const SIGNATURE: crate::imp::ConstBuffer;
 }
 

crates/libs/core/src/type.rs

@@ -26,10 +26,6 @@ pub trait Type<T: TypeKind, C = <T as TypeKind>::TypeKind>: TypeKind + Sized {
     /// # Safety
     unsafe fn from_abi(abi: Self::Abi) -> Result<Self>;
     fn from_default(default: &Self::Default) -> Result<Self>;
-
-    // TODO: this only used by ManuallyDrop
-    /// # Safety
-    unsafe fn from_abi_ref(abi: &Self::Abi) -> Option<&Self>;
 }
 
 impl<T> Type<T, ReferenceType> for T
@@ -47,14 +43,6 @@ where
         }
     }
 
-    unsafe fn from_abi_ref(abi: &Self::Abi) -> Option<&Self> {
-        if !abi.is_null() {
-            Some(std::mem::transmute(abi))
-        } else {
-            None
-        }
-    }
-
     fn from_default(default: &Self::Default) -> Result<Self> {
         default.as_ref().cloned().ok_or(Error::OK)
     }
@@ -71,10 +59,6 @@ where
         Ok(abi.assume_init())
     }
 
-    unsafe fn from_abi_ref(abi: &Self::Abi) -> Option<&Self> {
-        Some(std::mem::transmute(abi))
-    }
-
     fn from_default(default: &Self::Default) -> Result<Self> {
         Ok(default.clone())
     }
@@ -91,10 +75,6 @@ where
         Ok(abi)
     }
 
-    unsafe fn from_abi_ref(abi: &Self::Abi) -> Option<&Self> {
-        Some(abi)
-    }
-
     fn from_default(default: &Self) -> Result<Self> {
         Ok(default.clone())
     }

crates/libs/metadata/Cargo.toml

@@ -10,16 +10,3 @@ repository = "https://github.com/microsoft/windows-rs"
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"
 targets = []
-
-[dependencies.tokens]
-package = "windows-tokens"
-path = "../tokens"
-version = "0.48.0"
-
-[dependencies.syn]
-version = "2.0"
-features = ["full", "extra-traits"]
-
-[dependencies.proc-macro2]
-version = "1.0"
-features = ["span-locations"]