Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	crates/webidl/src/first_pass.rs
#	crates/webidl/src/lib.rs
#	crates/webidl/src/util.rs

crates/backend/src/ast.rs

@@ -56,7 +56,6 @@ pub enum MethodSelf {
 #[cfg_attr(feature = "extra-traits", derive(Debug, PartialEq, Eq))]
 pub struct Import {
     pub module: Option<String>,
-    pub version: Option<String>,
     pub js_namespace: Option<Ident>,
     pub kind: ImportKind,
 }
@@ -119,7 +118,7 @@ pub struct ImportStatic {
     pub ty: syn::Type,
     pub shim: Ident,
     pub rust_name: Ident,
-    pub js_name: Ident,
+    pub js_name: String,
 }
 
 #[cfg_attr(feature = "extra-traits", derive(Debug, PartialEq, Eq))]
@@ -146,7 +145,7 @@ pub struct ImportEnum {
 
 #[cfg_attr(feature = "extra-traits", derive(Debug, PartialEq, Eq))]
 pub struct Function {
-    pub name: Ident,
+    pub name: String,
     pub arguments: Vec<syn::ArgCaptured>,
     pub ret: Option<syn::Type>,
     pub rust_attrs: Vec<syn::Attribute>,
@@ -304,33 +303,8 @@ impl Variant {
 
 impl Import {
     fn shared(&self) -> Result<shared::Import, Diagnostic> {
-        match (&self.module, &self.version) {
-            (&Some(ref m), None) if m.starts_with("./") => {}
-            (&Some(ref m), &Some(_)) if m.starts_with("./") => {
-                panic!(
-                    "when a module path starts with `./` that indicates \
-                     that a local file is being imported so the `version` \
-                     key cannot also be specified"
-                );
-            }
-            (&Some(_), &Some(_)) => {}
-            (&Some(_), &None) => panic!(
-                "when the `module` directive doesn't start with `./` \
-                 then it's interpreted as an NPM package which requires \
-                 a `version` to be specified as well, try using \
-                 #[wasm_bindgen(module = \"...\", version = \"...\")]"
-            ),
-            (&None, &Some(_)) => {
-                panic!(
-                    "the #[wasm_bindgen(version = \"...\")] attribute can only \
-                     be used when `module = \"...\"` is also specified"
-                );
-            }
-            (&None, &None) => {}
-        }
         Ok(shared::Import {
             module: self.module.clone(),
-            version: self.version.clone(),
             js_namespace: self.js_namespace.as_ref().map(|s| s.to_string()),
             kind: self.kind.shared(),
         })

crates/backend/src/util.rs

@@ -94,7 +94,6 @@ pub fn ident_ty(ident: Ident) -> syn::Type {
 pub fn wrap_import_function(function: ast::ImportFunction) -> ast::Import {
     ast::Import {
         module: None,
-        version: None,
         js_namespace: None,
         kind: ast::ImportKind::Function(function),
     }