Skip to content

Commit ed05c7b

Browse files
alexcrichtonalexcrichton
authored
Fix compile on latest nightly (#489)
1 parent 1baf8f3 commit ed05c7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+372
-374
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Import JavaScript things into Rust and export Rust things to JavaScript.
2020
`src/lib.rs`:
2121

2222
```rust
23-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
23+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
2424

2525
extern crate wasm_bindgen;
2626
use wasm_bindgen::prelude::*;

‎crates/backend/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extra-traits = ["syn/extra-traits"]
1616

1717
[dependencies]
1818
quote = '0.6'
19-
proc-macro2 = "0.4"
19+
proc-macro2 = "0.4.8"
2020
wasm-bindgen-shared = { path = "../shared", version = "=0.2.11" }
2121
syn = { version = '0.14', features = ['full', 'visit-mut'] }
2222
serde_json = "1.0"

‎crates/macro/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ xxx_debug_only_print_generated_code = []
2020
[dependencies]
2121
syn = { version = '0.14', features = ['full'] }
2222
quote = '0.6'
23-
proc-macro2 = "0.4.4"
23+
proc-macro2 = "0.4.8"
2424
wasm-bindgen-backend = { path = "../backend", version = "=0.2.11" }
2525
wasm-bindgen-shared = { path = "../shared", version = "=0.2.11" }

‎crates/macro/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(proc_macro)]
2-
31
extern crate proc_macro;
42
extern crate proc_macro2;
53
extern crate quote;

‎crates/typescript/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ serde = "1.0"
88
serde_derive = "1.0"
99
serde_json = "1.0"
1010

11-
proc-macro2 = "0.4"
11+
proc-macro2 = "0.4.8"
1212
quote = "0.6"
13-
syn = { version = "0.14", default-features = false }
14-
wasm-bindgen = { path = "../..", default-features = false }
15-
wasm-bindgen-backend = { path = "../backend", default-features = false }
13+
syn = { version = "0.14", default-features = false }
14+
wasm-bindgen = { path = "../..", default-features = false }
15+
wasm-bindgen-backend = { path = "../backend", default-features = false }

‎crates/web-sys/tests/all/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn event() {
66
.file(
77
"src/lib.rs",
88
r#"
9-
#![feature(proc_macro, wasm_custom_section)]
9+
#![feature(use_extern_macros, wasm_custom_section)]
1010
extern crate wasm_bindgen;
1111
use wasm_bindgen::prelude::*;
1212
extern crate web_sys;

‎crates/web-sys/tests/all/headers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn headers() {
66
.file(
77
"src/lib.rs",
88
r#"
9-
#![feature(proc_macro, wasm_custom_section)]
9+
#![feature(use_extern_macros, wasm_custom_section)]
1010
extern crate wasm_bindgen;
1111
use wasm_bindgen::prelude::*;
1212
extern crate web_sys;

‎crates/web-sys/tests/all/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn response() {
66
.file(
77
"src/lib.rs",
88
r#"
9-
#![feature(proc_macro, wasm_custom_section)]
9+
#![feature(use_extern_macros, wasm_custom_section)]
1010
extern crate wasm_bindgen;
1111
use wasm_bindgen::prelude::*;
1212
extern crate web_sys;

‎crates/webidl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ wasm-bindgen-test-project-builder = { path = "../test-project-builder", version
1010
failure = "0.1"
1111
heck = "0.3"
1212
log = "0.4.1"
13-
proc-macro2 = "0.4"
13+
proc-macro2 = "0.4.8"
1414
quote = '0.6'
1515
syn = { version = '0.14', features = ['full'] }
1616
wasm-bindgen-backend = { version = "=0.2.11", path = "../backend" }

‎crates/webidl/tests/all/consts.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn bool() {
2424
.file(
2525
"src/lib.rs",
2626
r#"
27-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
27+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
2828
extern crate wasm_bindgen;
2929
use wasm_bindgen::prelude::*;
3030
@@ -93,7 +93,7 @@ fn ints() {
9393
.file(
9494
"src/lib.rs",
9595
r#"
96-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
96+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
9797
extern crate wasm_bindgen;
9898
use wasm_bindgen::prelude::*;
9999
@@ -160,7 +160,7 @@ fn floats() {
160160
.file(
161161
"src/lib.rs",
162162
r#"
163-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
163+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
164164
extern crate wasm_bindgen;
165165
use wasm_bindgen::prelude::*;
166166

‎crates/webidl/tests/all/enums.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn top_level_enum() {
3939
.file(
4040
"src/lib.rs",
4141
r#"
42-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
42+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
4343
4444
extern crate wasm_bindgen;
4545

‎crates/webidl/tests/all/simple.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn method() {
2929
.file(
3030
"src/lib.rs",
3131
r#"
32-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
32+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
3333
3434
extern crate wasm_bindgen;
3535
@@ -87,7 +87,7 @@ fn property() {
8787
.file(
8888
"src/lib.rs",
8989
r#"
90-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
90+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
9191
9292
extern crate wasm_bindgen;
9393
@@ -149,7 +149,7 @@ fn named_constructor() {
149149
.file(
150150
"src/lib.rs",
151151
r#"
152-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
152+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
153153
154154
extern crate wasm_bindgen;
155155
@@ -198,7 +198,7 @@ fn static_method() {
198198
.file(
199199
"src/lib.rs",
200200
r#"
201-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
201+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
202202
203203
extern crate wasm_bindgen;
204204
@@ -251,7 +251,7 @@ fn static_property() {
251251
.file(
252252
"src/lib.rs",
253253
r#"
254-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
254+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
255255
256256
extern crate wasm_bindgen;
257257
@@ -303,7 +303,7 @@ fn one_method_using_an_undefined_import_doesnt_break_all_other_methods() {
303303
.file(
304304
"src/lib.rs",
305305
r#"
306-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
306+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
307307
extern crate wasm_bindgen;
308308
use wasm_bindgen::prelude::*;
309309
@@ -348,7 +348,7 @@ fn unforgeable_is_structural() {
348348
.file(
349349
"src/lib.rs",
350350
r#"
351-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
351+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
352352
extern crate wasm_bindgen;
353353
use wasm_bindgen::prelude::*;
354354
@@ -405,7 +405,7 @@ fn partial_interface() {
405405
.file(
406406
"src/lib.rs",
407407
r#"
408-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
408+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
409409
extern crate wasm_bindgen;
410410
use wasm_bindgen::prelude::*;
411411
@@ -471,7 +471,7 @@ fn mixin() {
471471
.file(
472472
"src/lib.rs",
473473
r#"
474-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
474+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
475475
extern crate wasm_bindgen;
476476
use wasm_bindgen::prelude::*;
477477

‎crates/webidl/tests/all/throws.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fn throws() {
6464
.file(
6565
"src/lib.rs",
6666
r#"
67-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
67+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
6868
extern crate wasm_bindgen;
6969
use wasm_bindgen::prelude::*;
7070

‎examples/add/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/asm.js/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/char/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/closures/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/comments/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/console_log/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/dom/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/hello_world/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/import_js/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/julia_set/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module, js_globals)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module, js_globals)]
22

33
extern crate wasm_bindgen;
44
use wasm_bindgen::prelude::*;

‎examples/math/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/no_modules/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/performance/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate humantime;
44
extern crate wasm_bindgen;

‎examples/smorgasboard/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎examples/wasm-in-wasm/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
1+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
22

33
extern crate wasm_bindgen;
44

‎guide/src/basic-usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ wasm-bindgen = "0.2"
3939
Next up our actual code! We'll write this in `src/lib.rs`:
4040

4141
```rust,ignore
42-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
42+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
4343
4444
extern crate wasm_bindgen;
4545
use wasm_bindgen::prelude::*;

‎guide/src/what-else-can-we-do.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ can also [explore this code online](https://webassembly.studio/?f=t61j18noqz):
55

66
```rust,ignore
77
// src/lib.rs
8-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
8+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
99
1010
extern crate wasm_bindgen;
1111

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! interface.
77
88
#![feature(use_extern_macros, wasm_import_module, unsize)]
9-
#![cfg_attr(feature = "js_globals", feature(proc_macro, wasm_custom_section))]
9+
#![cfg_attr(feature = "js_globals", feature(use_extern_macros, wasm_custom_section))]
1010
#![no_std]
1111

1212
#[cfg(feature = "serde-serialize")]

‎tests/all/api.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn works() {
66
.file(
77
"src/lib.rs",
88
r#"
9-
#![feature(proc_macro, wasm_custom_section)]
9+
#![feature(use_extern_macros, wasm_custom_section)]
1010
1111
extern crate wasm_bindgen;
1212
@@ -157,7 +157,7 @@ fn eq_works() {
157157
.file(
158158
"src/lib.rs",
159159
r#"
160-
#![feature(proc_macro, wasm_custom_section)]
160+
#![feature(use_extern_macros, wasm_custom_section)]
161161
162162
extern crate wasm_bindgen;
163163

‎tests/all/char.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn works() {
66
.file(
77
"src/lib.rs",
88
r#"
9-
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
9+
#![feature(use_extern_macros, wasm_custom_section, wasm_import_module)]
1010
1111
extern crate wasm_bindgen;
1212

0 commit comments

Comments
 (0)