Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 16 insertions, 14 deletions

diff --git a/vendor/wasm-bindgen-shared/src/lib.rs b/vendor/wasm-bindgen-shared/src/lib.rs
index 408613be9..fb3e92cd9 100644
--- a/vendor/wasm-bindgen-shared/src/lib.rs
+++ b/vendor/wasm-bindgen-shared/src/lib.rs
@@ -6,7 +6,7 @@ mod schema_hash_approval;
 // This gets changed whenever our schema changes.
 // At this time versions of wasm-bindgen and wasm-bindgen-cli are required to have the exact same
 // SCHEMA_VERSION in order to work together.
-pub const SCHEMA_VERSION: &str = "0.2.84";
+pub const SCHEMA_VERSION: &str = "0.2.87";
 
 #[macro_export]
 macro_rules! shared_api {
@@ -123,6 +123,7 @@ macro_rules! shared_api {
             asyncness: bool,
             name: &'a str,
             generate_typescript: bool,
+            generate_jsdoc: bool,
             variadic: bool,
         }
 
@@ -139,6 +140,7 @@ macro_rules! shared_api {
             readonly: bool,
             comments: Vec<&'a str>,
             generate_typescript: bool,
+            generate_jsdoc: bool,
         }
 
         struct LocalModule<'a> {
@@ -150,17 +152,17 @@ macro_rules! shared_api {
 } // end of mac definition
 
 pub fn new_function(struct_name: &str) -> String {
-    let mut name = format!("__wbg_");
+    let mut name = "__wbg_".to_string();
     name.extend(struct_name.chars().flat_map(|s| s.to_lowercase()));
     name.push_str("_new");
-    return name;
+    name
 }
 
 pub fn free_function(struct_name: &str) -> String {
-    let mut name = format!("__wbg_");
+    let mut name = "__wbg_".to_string();
     name.extend(struct_name.chars().flat_map(|s| s.to_lowercase()));
     name.push_str("_free");
-    return name;
+    name
 }
 
 pub fn free_function_export_name(function_name: &str) -> String {
@@ -172,25 +174,25 @@ pub fn struct_function_export_name(struct_: &str, f: &str) -> String {
         .chars()
         .flat_map(|s| s.to_lowercase())
         .collect::<String>();
-    name.push_str("_");
+    name.push('_');
     name.push_str(f);
-    return name;
+    name
 }
 
 pub fn struct_field_get(struct_: &str, f: &str) -> String {
     let mut name = String::from("__wbg_get_");
     name.extend(struct_.chars().flat_map(|s| s.to_lowercase()));
-    name.push_str("_");
+    name.push('_');
     name.push_str(f);
-    return name;
+    name
 }
 
 pub fn struct_field_set(struct_: &str, f: &str) -> String {
     let mut name = String::from("__wbg_set_");
     name.extend(struct_.chars().flat_map(|s| s.to_lowercase()));
-    name.push_str("_");
+    name.push('_');
     name.push_str(f);
-    return name;
+    name
 }
 
 pub fn version() -> String {
@@ -198,7 +200,7 @@ pub fn version() -> String {
     if let Some(s) = option_env!("WBG_VERSION") {
         v.push_str(" (");
         v.push_str(s);
-        v.push_str(")");
+        v.push(')');
     }
-    return v;
+    v
 }
diff --git a/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs b/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs
index 0d4d0bb38..731dcea02 100644
--- a/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs
+++ b/vendor/wasm-bindgen-shared/src/schema_hash_approval.rs
@@ -8,7 +8,7 @@
 // If the schema in this library has changed then:
 //  1. Bump the version in `crates/shared/Cargo.toml`
 //  2. Change the `SCHEMA_VERSION` in this library to this new Cargo.toml version
-const APPROVED_SCHEMA_FILE_HASH: &'static str = "584864585234329974";
+const APPROVED_SCHEMA_FILE_HASH: &str = "12040133795598472740";
 
 #[test]
 fn schema_version() {