Fix standalone generation of individual enumerators (#2434)

microsoft · Apr 7, 2023 · 81b7b8c · 81b7b8c
1 parent 59f7bdc
commit 81b7b8c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/crates/libs/bindgen/src/standalone.rs b/crates/libs/bindgen/src/standalone.rs
@@ -19,7 +19,7 @@ pub fn standalone(names: &[&str]) -> String {
 
     let mut type_names = BTreeSet::new();
     let mut core_types = BTreeSet::new();
-    let mut enums = BTreeMap::new();
+    let mut enums = BTreeSet::new();
 
     for name in names {
         let type_name = TypeName::parse(name);
@@ -95,7 +95,7 @@ pub fn standalone(names: &[&str]) -> String {
                             found = true;
                             let enum_name = gen.reader.type_def_type_name(def);
                             type_names.insert(enum_name);
-                            enums.insert(enum_name, type_name.name);
+                            enums.insert((enum_name, type_name.name));
                         }
                     }
                 }

diff --git a/crates/tests/standalone/build.rs b/crates/tests/standalone/build.rs
@@ -59,7 +59,10 @@ fn main() {
 
     write(
         "src/b_enumerator.rs",
-        &["Windows.Win32.Foundation.WAIT_IO_COMPLETION"],
+        &[
+            "Windows.Win32.Foundation.WAIT_IO_COMPLETION",
+            "Windows.Win32.Foundation.WAIT_TIMEOUT",
+        ],
     );
 
     write(

diff --git a/crates/tests/standalone/src/b_enumerator.rs b/crates/tests/standalone/src/b_enumerator.rs
@@ -9,3 +9,4 @@
 )]
 pub type WIN32_ERROR = u32;
 pub const WAIT_IO_COMPLETION: WIN32_ERROR = 192u32;
+pub const WAIT_TIMEOUT: WIN32_ERROR = 258u32;
diff --git a/crates/tests/standalone/src/lib.rs b/crates/tests/standalone/src/lib.rs
@@ -97,6 +97,12 @@ fn unknown() {
     }
 }
 
+#[test]
+fn enumerator() {
+    assert_eq!(b_enumerator::WAIT_IO_COMPLETION, 192);
+    assert_eq!(b_enumerator::WAIT_TIMEOUT, 258);
+}
+
 #[test]
 fn test() {
     use b_test::*;