tooling

crates/tools/lib/src/lib.rs

@@ -9,15 +9,15 @@ pub enum CallingConvention {
 pub fn default_metadata() -> Vec<metadata::File> {
     vec![
         metadata::File::new(
-            std::include_bytes!("../../../libs/metadata/default/Windows.winmd").to_vec(),
+            std::include_bytes!("../../../libs/bindgen/default/Windows.winmd").to_vec(),
         )
         .expect("invalid winmd"),
         metadata::File::new(
-            std::include_bytes!("../../../libs/metadata/default/Windows.Win32.winmd").to_vec(),
+            std::include_bytes!("../../../libs/bindgen/default/Windows.Win32.winmd").to_vec(),
         )
         .expect("invalid winmd"),
         metadata::File::new(
-            std::include_bytes!("../../../libs/metadata/default/Windows.Wdk.winmd").to_vec(),
+            std::include_bytes!("../../../libs/bindgen/default/Windows.Wdk.winmd").to_vec(),
         )
         .expect("invalid winmd"),
     ]

crates/tools/metadata/bindings.txt

@@ -1,6 +1,6 @@
---in crates/libs/metadata/default
+--in crates/libs/bindgen/default
 --out crates/libs/metadata/src/imp/bindings.rs
---config FLATTEN SYS MINIMAL
+--config flatten sys minimal
 
 --filter
     Windows.Win32.System.Diagnostics.Debug.IMAGE_COR20_HEADER

crates/tools/riddle/Cargo.toml

@@ -7,15 +7,7 @@ license = "MIT OR Apache-2.0"
 description = "Windows metadata compiler"
 repository = "https://github.com/microsoft/windows-rs"
 
-[dependencies]
-windows-metadata = { path = "../../libs/metadata", version = "0.49.0" }
-rayon = "1.7"
-
-[dependencies.syn]
-version = "2.0"
-features = ["full", "extra-traits"]
-
-[dependencies.proc-macro2]
-version = "1.0"
-features = ["span-locations"]
-
+[dependencies.windows-bindgen]
+path = "../../libs/bindgen"
+version = "0.49.0"
+default-features = false