Update Rust version for UI tests

rustwasm · Feb 21, 2024 · a97b42b · a97b42b
1 parent 6150e21
commit a97b42b
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 27 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -246,7 +246,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: rustup update --no-self-update 1.69.0 && rustup default 1.69.0
+    - run: rustup update --no-self-update 1.73.0 && rustup default 1.73.0
     - run: cargo test -p wasm-bindgen-macro
     - run: cargo test -p wasm-bindgen-test-macro
 

diff --git a/crates/macro/ui-tests/async-errors.stderr b/crates/macro/ui-tests/async-errors.stderr
@@ -27,14 +27,14 @@ error[E0277]: the trait bound `wasm_bindgen::JsValue: From<BadType>` is not sati
    | ^^^^^^^^^^^^^^^ the trait `From<BadType>` is not implemented for `wasm_bindgen::JsValue`
    |
    = help: the following other types implement trait `From<T>`:
-             <wasm_bindgen::JsValue as From<&'a String>>
-             <wasm_bindgen::JsValue as From<&'a T>>
-             <wasm_bindgen::JsValue as From<&'a str>>
-             <wasm_bindgen::JsValue as From<*const T>>
-             <wasm_bindgen::JsValue as From<*mut T>>
-             <wasm_bindgen::JsValue as From<Array>>
-             <wasm_bindgen::JsValue as From<ArrayBuffer>>
-             <wasm_bindgen::JsValue as From<BigInt64Array>>
+             <wasm_bindgen::JsValue as From<bool>>
+             <wasm_bindgen::JsValue as From<isize>>
+             <wasm_bindgen::JsValue as From<i8>>
+             <wasm_bindgen::JsValue as From<i16>>
+             <wasm_bindgen::JsValue as From<i32>>
+             <wasm_bindgen::JsValue as From<i64>>
+             <wasm_bindgen::JsValue as From<i128>>
+             <wasm_bindgen::JsValue as From<usize>>
            and $N others
    = note: required for `BadType` to implement `Into<wasm_bindgen::JsValue>`
    = note: required for `BadType` to implement `IntoJsResult`

diff --git a/crates/macro/ui-tests/missing-catch.stderr b/crates/macro/ui-tests/missing-catch.stderr
@@ -5,12 +5,12 @@ error[E0277]: the trait bound `Result<wasm_bindgen::JsValue, wasm_bindgen::JsVal
   |            ^^^ the trait `FromWasmAbi` is not implemented for `Result<wasm_bindgen::JsValue, wasm_bindgen::JsValue>`
   |
   = help: the following other types implement trait `FromWasmAbi`:
-            *const T
-            *mut T
-            Box<[T]>
-            Clamped<T>
-            Option<T>
-            Option<f32>
-            Option<f64>
-            Option<i32>
+            bool
+            char
+            isize
+            i8
+            i16
+            i32
+            i64
+            usize
           and $N others
diff --git a/crates/macro/ui-tests/struct-fields.stderr b/crates/macro/ui-tests/struct-fields.stderr
@@ -24,5 +24,6 @@ error[E0277]: the trait bound `Foo: Clone` is not satisfied
    |
 help: consider annotating `Foo` with `#[derive(Clone)]`
    |
-3  | #[derive(Clone)]
+3  + #[derive(Clone)]
+4  | #[wasm_bindgen]
    |
diff --git a/crates/macro/ui-tests/traits-not-implemented.stderr b/crates/macro/ui-tests/traits-not-implemented.stderr
@@ -5,13 +5,13 @@ error[E0277]: the trait bound `A: IntoWasmAbi` is not satisfied
   | ^^^^^^^^^^^^^^^ the trait `IntoWasmAbi` is not implemented for `A`
   |
   = help: the following other types implement trait `IntoWasmAbi`:
-            &'a (dyn Fn() -> R + 'b)
-            &'a (dyn Fn(A) -> R + 'b)
-            &'a (dyn Fn(A, B) -> R + 'b)
-            &'a (dyn Fn(A, B, C) -> R + 'b)
-            &'a (dyn Fn(A, B, C, D) -> R + 'b)
-            &'a (dyn Fn(A, B, C, D, E) -> R + 'b)
-            &'a (dyn Fn(A, B, C, D, E, F) -> R + 'b)
-            &'a (dyn Fn(A, B, C, D, E, F, G) -> R + 'b)
+            bool
+            char
+            isize
+            i8
+            i16
+            i32
+            i64
+            usize
           and $N others
   = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/crates/macro/ui-tests/wasm-bindgen.stderr b/crates/macro/ui-tests/wasm-bindgen.stderr
@@ -5,6 +5,12 @@ error[E0433]: failed to resolve: could not find `convert` in `test`
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ could not find `convert` in `test`
    |
    = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider importing one of these items
+   |
+3  + use crate::test::test::convert;
+   |
+3  + use wasm_bindgen::convert;
+   |
 
 error[E0425]: cannot find function `future_to_promise` in module `test`
   --> ui-tests/wasm-bindgen.rs:40:1
@@ -15,5 +21,5 @@ error[E0425]: cannot find function `future_to_promise` in module `test`
    = note: this error originates in the attribute macro `wasm_bindgen` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing this function
    |
-3  | use wasm_bindgen_futures::future_to_promise;
+3  + use wasm_bindgen_futures::future_to_promise;
    |
diff --git a/crates/test-macro/ui-tests/crate.stderr b/crates/test-macro/ui-tests/crate.stderr
@@ -3,3 +3,8 @@ error[E0433]: failed to resolve: use of undeclared crate or module `foo`
    |
 17 | #[wasm_bindgen_test(crate = foo)]
    |                             ^^^ use of undeclared crate or module `foo`
+   |
+help: consider importing this module
+   |
+5  + use wasm_bindgen_test::__rt;
+   |