Fix two cases of non-deterministic iteration (#2304)

* Fix two cases of non-deterministic iteration

This commit fixes an issue of nondeterministic JS generation when
closures were used, updating a few iterations of hash maps to iterate in
a sorted manner rather than via the raw internal order.

Closes #2302

* Reformat web-sys with latest proc-macro

Author: alexcrichton

crates/cli-support/src/descriptors.rs

@@ -116,7 +116,10 @@ impl WasmBindgenDescriptorsSection {
         // freshly manufactured import. Save off the type of this import in
         // ourselves, and then we're good to go.
         let ty = module.funcs.get(wbindgen_describe_closure).ty();
-        for (func, descriptor) in func_to_descriptor {
+        // sort to ensure ids and caches are consistent across runs
+        let mut items = func_to_descriptor.into_iter().collect::<Vec<_>>();
+        items.sort_by_key(|i| i.0);
+        for (func, descriptor) in items {
             // This uses a cache so that if the same closure exists multiple times it will
             // deduplicate it so it only exists once.
             let id = match self.cached_closures.get(&descriptor) {

crates/cli-support/src/wit/mod.rs

@@ -183,13 +183,13 @@ impl<'a> Context<'a> {
             // Finally we store all this metadata in the import map which we've
             // learned so when a binding for the import is generated we can
             // generate all the appropriate shims.
-            for (id, descriptor) in closure_imports {
+            for (id, descriptor) in crate::sorted_iter(&closure_imports) {
                 let signature = Function {
                     shim_idx: 0,
                     arguments: vec![Descriptor::I32; 3],
                     ret: Descriptor::Externref,
                 };
-                let id = self.import_adapter(id, signature, AdapterJsImportKind::Normal)?;
+                let id = self.import_adapter(*id, signature, AdapterJsImportKind::Normal)?;
                 // Synthesize the two integer pointers we pass through which
                 // aren't present in the signature but are present in the wasm
                 // signature.

crates/web-sys/src/features/gen_AbortController.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AbortController , typescript_type = "AbortController" ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AbortController , typescript_type = "AbortController")]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AbortController` class."]
     #[doc = ""]
@@ -12,7 +12,7 @@ extern "C" {
     #[doc = "*This API requires the following crate features to be activated: `AbortController`*"]
     pub type AbortController;
     #[cfg(feature = "AbortSignal")]
-    # [ wasm_bindgen ( structural , method , getter , js_class = "AbortController" , js_name = signal ) ]
+    # [wasm_bindgen (structural , method , getter , js_class = "AbortController" , js_name = signal)]
     #[doc = "Getter for the `signal` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortController/signal)"]
@@ -26,7 +26,7 @@ extern "C" {
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `AbortController`*"]
     pub fn new() -> Result<AbortController, JsValue>;
-    # [ wasm_bindgen ( method , structural , js_class = "AbortController" , js_name = abort ) ]
+    # [wasm_bindgen (method , structural , js_class = "AbortController" , js_name = abort)]
     #[doc = "The `abort()` method."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortController/abort)"]

crates/web-sys/src/features/gen_AbortSignal.rs

@@ -3,29 +3,29 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = EventTarget , extends = :: js_sys :: Object , js_name = AbortSignal , typescript_type = "AbortSignal" ) ]
+    # [wasm_bindgen (extends = EventTarget , extends = :: js_sys :: Object , js_name = AbortSignal , typescript_type = "AbortSignal")]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AbortSignal` class."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)"]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `AbortSignal`*"]
     pub type AbortSignal;
-    # [ wasm_bindgen ( structural , method , getter , js_class = "AbortSignal" , js_name = aborted ) ]
+    # [wasm_bindgen (structural , method , getter , js_class = "AbortSignal" , js_name = aborted)]
     #[doc = "Getter for the `aborted` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/aborted)"]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `AbortSignal`*"]
     pub fn aborted(this: &AbortSignal) -> bool;
-    # [ wasm_bindgen ( structural , method , getter , js_class = "AbortSignal" , js_name = onabort ) ]
+    # [wasm_bindgen (structural , method , getter , js_class = "AbortSignal" , js_name = onabort)]
     #[doc = "Getter for the `onabort` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/onabort)"]
     #[doc = ""]
     #[doc = "*This API requires the following crate features to be activated: `AbortSignal`*"]
     pub fn onabort(this: &AbortSignal) -> Option<::js_sys::Function>;
-    # [ wasm_bindgen ( structural , method , setter , js_class = "AbortSignal" , js_name = onabort ) ]
+    # [wasm_bindgen (structural , method , setter , js_class = "AbortSignal" , js_name = onabort)]
     #[doc = "Setter for the `onabort` field of this object."]
     #[doc = ""]
     #[doc = "[MDN Documentation](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/onabort)"]

crates/web-sys/src/features/gen_AddEventListenerOptions.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AddEventListenerOptions ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AddEventListenerOptions)]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AddEventListenerOptions` dictionary."]
     #[doc = ""]

crates/web-sys/src/features/gen_AesCbcParams.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AesCbcParams ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AesCbcParams)]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AesCbcParams` dictionary."]
     #[doc = ""]

crates/web-sys/src/features/gen_AesCtrParams.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AesCtrParams ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AesCtrParams)]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AesCtrParams` dictionary."]
     #[doc = ""]

crates/web-sys/src/features/gen_AesDerivedKeyParams.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AesDerivedKeyParams ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AesDerivedKeyParams)]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AesDerivedKeyParams` dictionary."]
     #[doc = ""]

crates/web-sys/src/features/gen_AesGcmParams.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AesGcmParams ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AesGcmParams)]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AesGcmParams` dictionary."]
     #[doc = ""]

crates/web-sys/src/features/gen_AesKeyAlgorithm.rs

@@ -3,7 +3,7 @@ use super::*;
 use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 extern "C" {
-    # [ wasm_bindgen ( extends = :: js_sys :: Object , js_name = AesKeyAlgorithm ) ]
+    # [wasm_bindgen (extends = :: js_sys :: Object , js_name = AesKeyAlgorithm)]
     #[derive(Debug, Clone, PartialEq, Eq)]
     #[doc = "The `AesKeyAlgorithm` dictionary."]
     #[doc = ""]