Skip to content

Commit 5621603

Browse files
alexcrichtonalexcrichton
authored
Try to fix CI (#3414)
* Update UI errors to current stable Rust * Update nightlies used in CI
1 parent c600fbe commit 5621603

9 files changed

+68
-34
lines changed

‎.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
steps:
8080
- uses: actions/checkout@v3
81-
- run: rustup default nightly-2022-05-19
81+
- run: rustup default nightly-2023-05-08
8282
- run: rustup target add wasm32-unknown-unknown
8383
- run: rustup component add rust-src
8484
# Note: we only run the browser tests here, because wasm-bindgen doesn't support threading in Node yet.
@@ -221,7 +221,7 @@ jobs:
221221
runs-on: ubuntu-latest
222222
steps:
223223
- uses: actions/checkout@v3
224-
- run: rustup update --no-self-update 1.60.0 && rustup default 1.60.0
224+
- run: rustup update --no-self-update 1.69.0 && rustup default 1.69.0
225225
- run: cargo test -p wasm-bindgen-macro
226226
- run: cargo test -p wasm-bindgen-test-macro
227227

@@ -258,7 +258,7 @@ jobs:
258258
runs-on: ubuntu-latest
259259
steps:
260260
- uses: actions/checkout@v3
261-
- run: rustup default nightly-2022-05-19
261+
- run: rustup default nightly-2023-05-08
262262
- run: rustup target add wasm32-unknown-unknown
263263
- run: rustup component add rust-src
264264
- run: |

‎crates/macro/ui-tests/async-errors.stderr

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ error[E0277]: the trait bound `Result<(), ()>: IntoJsResult` is not satisfied
44
30 | #[wasm_bindgen]
55
| ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `Result<(), ()>`
66
|
7-
= help: the following implementations were found:
8-
<Result<(), E> as IntoJsResult>
9-
<Result<T, E> as IntoJsResult>
7+
= help: the following other types implement trait `IntoJsResult`:
8+
Result<(), E>
9+
Result<T, E>
1010
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
1111

1212
error[E0277]: the trait bound `Result<(), BadType>: IntoJsResult` is not satisfied
@@ -15,9 +15,9 @@ error[E0277]: the trait bound `Result<(), BadType>: IntoJsResult` is not satisfi
1515
32 | #[wasm_bindgen]
1616
| ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `Result<(), BadType>`
1717
|
18-
= help: the following implementations were found:
19-
<Result<(), E> as IntoJsResult>
20-
<Result<T, E> as IntoJsResult>
18+
= help: the following other types implement trait `IntoJsResult`:
19+
Result<(), E>
20+
Result<T, E>
2121
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
2222

2323
error[E0277]: the trait bound `wasm_bindgen::JsValue: From<BadType>` is not satisfied
@@ -26,14 +26,18 @@ error[E0277]: the trait bound `wasm_bindgen::JsValue: From<BadType>` is not sati
2626
34 | #[wasm_bindgen]
2727
| ^^^^^^^^^^^^^^^ the trait `From<BadType>` is not implemented for `wasm_bindgen::JsValue`
2828
|
29-
= help: the following implementations were found:
29+
= help: the following other types implement trait `From<T>`:
3030
<wasm_bindgen::JsValue as From<&'a String>>
3131
<wasm_bindgen::JsValue as From<&'a T>>
3232
<wasm_bindgen::JsValue as From<&'a str>>
3333
<wasm_bindgen::JsValue as From<*const T>>
34-
and $N others
35-
= note: required because of the requirements on the impl of `Into<wasm_bindgen::JsValue>` for `BadType`
36-
= note: required because of the requirements on the impl of `IntoJsResult` for `BadType`
34+
<wasm_bindgen::JsValue as From<*mut T>>
35+
<wasm_bindgen::JsValue as From<JsError>>
36+
<wasm_bindgen::JsValue as From<MyType>>
37+
<wasm_bindgen::JsValue as From<Option<T>>>
38+
and 72 others
39+
= note: required for `BadType` to implement `Into<wasm_bindgen::JsValue>`
40+
= note: required for `BadType` to implement `IntoJsResult`
3741
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
3842

3943
error[E0277]: the trait bound `Result<BadType, wasm_bindgen::JsValue>: IntoJsResult` is not satisfied
@@ -42,7 +46,7 @@ error[E0277]: the trait bound `Result<BadType, wasm_bindgen::JsValue>: IntoJsRes
4246
36 | #[wasm_bindgen]
4347
| ^^^^^^^^^^^^^^^ the trait `IntoJsResult` is not implemented for `Result<BadType, wasm_bindgen::JsValue>`
4448
|
45-
= help: the following implementations were found:
46-
<Result<(), E> as IntoJsResult>
47-
<Result<T, E> as IntoJsResult>
49+
= help: the following other types implement trait `IntoJsResult`:
50+
Result<(), E>
51+
Result<T, E>
4852
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)

‎crates/macro/ui-tests/invalid-imports.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ error: first argument of method must be a shared reference
1717
| ^^^
1818

1919
error: first argument of method must be a path
20-
--> ui-tests/invalid-imports.rs:14:14
20+
--> ui-tests/invalid-imports.rs:14:15
2121
|
2222
14 | fn f3(x: &&u32);
23-
| ^^^^^
23+
| ^^^^
2424

2525
error: paths with type parameters are not supported yet
2626
--> ui-tests/invalid-imports.rs:20:15

‎crates/macro/ui-tests/missing-catch.stderr

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,14 @@ error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsVal
33
|
44
6 | pub fn foo() -> Result<JsValue, JsValue>;
55
| ^^^ the trait `FromWasmAbi` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
6+
|
7+
= help: the following other types implement trait `FromWasmAbi`:
8+
*const T
9+
*mut T
10+
Box<[T]>
11+
Box<[f32]>
12+
Box<[f64]>
13+
Box<[i16]>
14+
Box<[i32]>
15+
Box<[i64]>
16+
and 35 others

‎crates/macro/ui-tests/start-function.stderr

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::
1616
15 | #[wasm_bindgen(start)]
1717
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, ()>`
1818
|
19-
= help: the following implementations were found:
20-
<Result<(), E> as wasm_bindgen::__rt::Start>
19+
= help: the trait `wasm_bindgen::__rt::Start` is implemented for `Result<(), E>`
2120
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
2221

2322
error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: wasm_bindgen::__rt::Start` is not satisfied
@@ -26,8 +25,7 @@ error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsVal
2625
18 | #[wasm_bindgen(start)]
2726
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
2827
|
29-
= help: the following implementations were found:
30-
<Result<(), E> as wasm_bindgen::__rt::Start>
28+
= help: the trait `wasm_bindgen::__rt::Start` is implemented for `Result<(), E>`
3129
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
3230

3331
error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::__rt::Start` is not satisfied
@@ -36,8 +34,7 @@ error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, ()>: wasm_bindgen::
3634
27 | #[wasm_bindgen(start)]
3735
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, ()>`
3836
|
39-
= help: the following implementations were found:
40-
<Result<(), E> as wasm_bindgen::__rt::Start>
37+
= help: the trait `wasm_bindgen::__rt::Start` is implemented for `Result<(), E>`
4138
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
4239

4340
error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>: wasm_bindgen::__rt::Start` is not satisfied
@@ -46,6 +43,5 @@ error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsVal
4643
30 | #[wasm_bindgen(start)]
4744
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `wasm_bindgen::__rt::Start` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
4845
|
49-
= help: the following implementations were found:
50-
<Result<(), E> as wasm_bindgen::__rt::Start>
46+
= help: the trait `wasm_bindgen::__rt::Start` is implemented for `Result<(), E>`
5147
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)

‎crates/macro/ui-tests/struct-fields.stderr

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,21 @@ note: required by a bound in `__wbg_get_bar_a::assert_copy`
88
--> ui-tests/struct-fields.rs:8:1
99
|
1010
8 | #[wasm_bindgen]
11-
| ^^^^^^^^^^^^^^^ required by this bound in `__wbg_get_bar_a::assert_copy`
11+
| ^^^^^^^^^^^^^^^ required by this bound in `assert_copy`
1212
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

1414
error[E0277]: the trait bound `Foo: Clone` is not satisfied
1515
--> ui-tests/struct-fields.rs:11:20
1616
|
17-
11 | #[wasm_bindgen(getter_with_clone)]
18-
| ^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `Foo`
17+
11 | #[wasm_bindgen(getter_with_clone)]
18+
| ^----------------
19+
| |
20+
| ____________________required by a bound introduced by this call
21+
| |
22+
12 | | pub b: Foo,
23+
| |_________^ the trait `Clone` is not implemented for `Foo`
24+
|
25+
help: consider annotating `Foo` with `#[derive(Clone)]`
26+
|
27+
3 | #[derive(Clone)]
28+
|

‎crates/macro/ui-tests/traits-not-implemented.stderr

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@ error[E0277]: the trait bound `A: IntoWasmAbi` is not satisfied
44
5 | #[wasm_bindgen]
55
| ^^^^^^^^^^^^^^^ the trait `IntoWasmAbi` is not implemented for `A`
66
|
7+
= help: the following other types implement trait `IntoWasmAbi`:
8+
&'a (dyn Fn() -> R + 'b)
9+
&'a (dyn Fn(A) -> R + 'b)
10+
&'a (dyn Fn(A, B) -> R + 'b)
11+
&'a (dyn Fn(A, B, C) -> R + 'b)
12+
&'a (dyn Fn(A, B, C, D) -> R + 'b)
13+
&'a (dyn Fn(A, B, C, D, E) -> R + 'b)
14+
&'a (dyn Fn(A, B, C, D, E, F) -> R + 'b)
15+
&'a (dyn Fn(A, B, C, D, E, F, G) -> R + 'b)
16+
and 84 others
717
= note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)

‎crates/macro/ui-tests/unknown-type-in-import.stderr

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
error[E0412]: cannot find type `A` in this scope
2-
--> $DIR/unknown-type-in-import.rs:6:19
2+
--> ui-tests/unknown-type-in-import.rs:6:19
33
|
44
6 | pub fn foo(a: A);
5-
| - ^ not found in this scope
6-
| |
7-
| help: you might be missing a type parameter: `<A>`
5+
| ^ not found in this scope
6+
|
7+
help: you might be missing a type parameter
8+
|
9+
6 | pub fn foo<A>(a: A);
10+
| +++

‎crates/test-macro/ui-tests/should_panic.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: malformed `#[should_panic = "..."]` attribute
22
--> ui-tests/should_panic.rs:28:15
33
|
44
28 | #[should_panic::error]
5-
| ^^
5+
| ^
66

77
error: malformed `#[should_panic]` attribute
88
--> ui-tests/should_panic.rs:32:18

0 commit comments

Comments
 (0)