Remove usage of wasm_import_module feature

alexcrichton · alexcrichton · commit 906cd7adcc4a · 2018-07-21T19:00:40.000-07:00
This is now stabilized! Also tweak usage of it to the stable version.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Import JavaScript things into Rust and export Rust things to JavaScript.
 `src/lib.rs`:
 
 ```rust
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 use wasm_bindgen::prelude::*;
diff --git a/crates/backend/src/codegen.rs b/crates/backend/src/codegen.rs
@@ -148,7 +148,7 @@ impl ToTokens for ast::Struct {
                         unsafe { &mut ::wasm_bindgen::convert::GlobalStack::new() },
                     );
 
-                    #[wasm_import_module = "__wbindgen_placeholder__"]
+                    #[link(wasm_import_module = "__wbindgen_placeholder__")]
                     extern {
                         fn #new_fn(ptr: u32) -> u32;
                     }
@@ -784,7 +784,7 @@ impl ToTokens for ast::ImportFunction {
             #vis fn #rust_name(#me #(#arguments),*) #ret {
                 // See definition of `link_mem_intrinsics` for what this is doing
                 ::wasm_bindgen::__rt::link_mem_intrinsics();
-                #[wasm_import_module = "__wbindgen_placeholder__"]
+                #[link(wasm_import_module = "__wbindgen_placeholder__")]
                 extern {
                     fn #import_name(#(#abi_arguments),*) -> #abi_ret;
                 }
@@ -910,7 +910,7 @@ impl ToTokens for ast::ImportStatic {
             #vis static #name: ::wasm_bindgen::JsStatic<#ty> = {
                 #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
                 fn init() -> #ty {
-                    #[wasm_import_module = "__wbindgen_placeholder__"]
+                    #[link(wasm_import_module = "__wbindgen_placeholder__")]
                     extern {
                         fn #shim_name() -> <#ty as ::wasm_bindgen::convert::FromWasmAbi>::Abi;
                     }
diff --git a/crates/js-sys/src/lib.rs b/crates/js-sys/src/lib.rs
@@ -17,7 +17,7 @@
 //! bindings.
 
 #![doc(html_root_url = "https://docs.rs/js-sys/0.2")]
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/crates/js-sys/tests/wasm/main.rs b/crates/js-sys/tests/wasm/main.rs
@@ -1,5 +1,5 @@
 #![cfg(target_arch = "wasm32")]
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 #![allow(non_snake_case)]
 
 extern crate js_sys;
diff --git a/crates/test/src/lib.rs b/crates/test/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! More documentation can be found in the README for this crate!
 
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen_test_macro;
 extern crate wasm_bindgen;
diff --git a/crates/web-sys/src/lib.rs b/crates/web-sys/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(wasm_import_module)]
 #![doc(html_root_url = "https://docs.rs/web-sys/0.2")]
 
 extern crate wasm_bindgen;
diff --git a/crates/web-sys/tests/all/headers.rs b/crates/web-sys/tests/all/headers.rs
@@ -6,7 +6,7 @@ fn headers() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
                 extern crate web_sys;
diff --git a/crates/webidl/tests/all/array.rs b/crates/webidl/tests/all/array.rs
@@ -102,7 +102,7 @@ fn take_and_return_a_bunch_of_slices() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
diff --git a/crates/webidl/tests/all/consts.rs b/crates/webidl/tests/all/consts.rs
@@ -24,7 +24,7 @@ fn bool() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
@@ -93,7 +93,7 @@ fn ints() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
@@ -160,7 +160,7 @@ fn floats() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
diff --git a/crates/webidl/tests/all/enums.rs b/crates/webidl/tests/all/enums.rs
@@ -39,7 +39,7 @@ fn top_level_enum() {
         .file(
             "src/lib.rs",
             r#"
-            #![feature(use_extern_macros, wasm_import_module)]
+            #![feature(use_extern_macros)]
 
             extern crate wasm_bindgen;
 
diff --git a/crates/webidl/tests/all/simple.rs b/crates/webidl/tests/all/simple.rs
@@ -29,7 +29,7 @@ fn method() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
@@ -87,7 +87,7 @@ fn property() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
@@ -149,7 +149,7 @@ fn named_constructor() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
@@ -198,7 +198,7 @@ fn static_method() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
@@ -251,7 +251,7 @@ fn static_property() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
@@ -303,7 +303,7 @@ fn one_method_using_an_undefined_import_doesnt_break_all_other_methods() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
@@ -348,7 +348,7 @@ fn unforgeable_is_structural() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
@@ -405,7 +405,7 @@ fn partial_interface() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
@@ -471,7 +471,7 @@ fn mixin() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
diff --git a/crates/webidl/tests/all/throws.rs b/crates/webidl/tests/all/throws.rs
@@ -64,7 +64,7 @@ fn throws() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
                 extern crate wasm_bindgen;
                 use wasm_bindgen::prelude::*;
 
diff --git a/examples/add/src/lib.rs b/examples/add/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/asm.js/src/lib.rs b/examples/asm.js/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/char/src/lib.rs b/examples/char/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/closures/src/lib.rs b/examples/closures/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 extern crate js_sys;
diff --git a/examples/comments/src/lib.rs b/examples/comments/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/console_log/src/lib.rs b/examples/console_log/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/dom/src/lib.rs b/examples/dom/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/hello_world/src/lib.rs b/examples/hello_world/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/import_js/src/lib.rs b/examples/import_js/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/julia_set/src/lib.rs b/examples/julia_set/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module, js_globals)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 use wasm_bindgen::prelude::*;
diff --git a/examples/math/src/lib.rs b/examples/math/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/no_modules/src/lib.rs b/examples/no_modules/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/performance/src/lib.rs b/examples/performance/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate humantime;
 extern crate wasm_bindgen;
diff --git a/examples/smorgasboard/src/lib.rs b/examples/smorgasboard/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/examples/wasm-in-wasm/src/lib.rs b/examples/wasm-in-wasm/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/guide/src/basic-usage.md b/guide/src/basic-usage.md
@@ -39,7 +39,7 @@ wasm-bindgen = "0.2"
 Next up our actual code! We'll write this in `src/lib.rs`:
 
 ```rust,ignore
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 use wasm_bindgen::prelude::*;
diff --git a/guide/src/what-else-can-we-do.md b/guide/src/what-else-can-we-do.md
@@ -5,7 +5,7 @@ can also [explore this code online](https://webassembly.studio/?f=t61j18noqz):
 
 ```rust,ignore
 // src/lib.rs
-#![feature(use_extern_macros, wasm_import_module)]
+#![feature(use_extern_macros)]
 
 extern crate wasm_bindgen;
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -5,7 +5,7 @@
 //! this crate and this crate also provides JS bindings through the `JsValue`
 //! interface.
 
-#![feature(use_extern_macros, wasm_import_module, unsize)]
+#![feature(use_extern_macros, unsize)]
 #![no_std]
 #![doc(html_root_url = "https://docs.rs/wasm-bindgen/0.2")]
 
@@ -368,7 +368,7 @@ numbers! { i8 u8 i16 u16 i32 u32 f32 f64 }
 macro_rules! externs {
     ($(fn $name:ident($($args:tt)*) -> $ret:ty;)*) => (
         #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
-        #[wasm_import_module = "__wbindgen_placeholder__"]
+        #[link(wasm_import_module = "__wbindgen_placeholder__")]
         extern {
             $(fn $name($($args)*) -> $ret;)*
         }
diff --git a/tests/all/api.rs b/tests/all/api.rs
@@ -201,7 +201,7 @@ fn null_keeps_working() {
         .file(
             "src/lib.rs",
             r#"
-                #![feature(use_extern_macros, wasm_import_module)]
+                #![feature(use_extern_macros)]
 
                 extern crate wasm_bindgen;
 
diff --git a/tests/all/char.rs b/tests/all/char.rs
@@ -6,7 +6,7 @@ fn works() {
         .file(
             "src/lib.rs",
             r#"
-            #![feature(use_extern_macros, wasm_import_module)]
+            #![feature(use_extern_macros)]
 
             extern crate wasm_bindgen;
 
diff --git a/tests/all/classes.rs b/tests/all/classes.rs
diff --git a/tests/all/closures.rs b/tests/all/closures.rs
diff --git a/tests/all/comments.rs b/tests/all/comments.rs
diff --git a/tests/all/dependencies.rs b/tests/all/dependencies.rs
diff --git a/tests/all/import_class.rs b/tests/all/import_class.rs
diff --git a/tests/all/imports.rs b/tests/all/imports.rs
diff --git a/tests/all/jsobjects.rs b/tests/all/jsobjects.rs
diff --git a/tests/all/node.rs b/tests/all/node.rs
diff --git a/tests/all/non_debug.rs b/tests/all/non_debug.rs
diff --git a/tests/all/non_wasm.rs b/tests/all/non_wasm.rs
diff --git a/tests/all/simple.rs b/tests/all/simple.rs
diff --git a/tests/all/slice.rs b/tests/all/slice.rs
diff --git a/tests/all/structural.rs b/tests/all/structural.rs
diff --git a/tests/all/typescript.rs b/tests/all/typescript.rs
diff --git a/tests/all/u64.rs b/tests/all/u64.rs
diff --git a/tests/all/validate_prt.rs b/tests/all/validate_prt.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#![feature(wasm_import_module)]`
`2`	`1`	`#![doc(html_root_url = "https://docs.rs/web-sys/0.2")]`
`3`	`2`
`4`	`3`	`extern crate wasm_bindgen;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![feature(use_extern_macros, wasm_import_module)]`
	`1`	`+#![feature(use_extern_macros)]`
`2`	`2`
`3`	`3`	`extern crate wasm_bindgen;`
`4`	`4`