From e7bfa161e0aa83ed00d548b579dac4c6670f0c08 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 6 Nov 2019 09:15:51 -0800 Subject: [PATCH] Fix UI tests for updated beta --- crates/macro/ui-tests/async-errors.stderr | 2 -- crates/macro/ui-tests/attribute-fails-to-parse.stderr | 2 -- crates/macro/ui-tests/bad-signatures.stderr | 2 -- crates/macro/ui-tests/import-local.stderr | 2 -- crates/macro/ui-tests/invalid-attr.stderr | 2 -- crates/macro/ui-tests/invalid-enums.stderr | 2 -- crates/macro/ui-tests/invalid-imports.stderr | 2 -- crates/macro/ui-tests/invalid-items.stderr | 2 -- crates/macro/ui-tests/invalid-methods.stderr | 2 -- crates/macro/ui-tests/invalid-setter.stderr | 2 -- crates/macro/ui-tests/missing-catch.stderr | 3 --- crates/macro/ui-tests/non-public-function.stderr | 2 -- crates/macro/ui-tests/pub-not-copy.stderr | 2 -- crates/macro/ui-tests/start-function.stderr | 2 -- crates/macro/ui-tests/structural-and-final.stderr | 2 -- crates/macro/ui-tests/traits-not-implemented.stderr | 3 --- crates/macro/ui-tests/unknown-type-in-import.stderr | 3 --- crates/macro/ui-tests/unused-attributes.stderr | 2 -- src/closure.rs | 2 +- 19 files changed, 1 insertion(+), 40 deletions(-) diff --git a/crates/macro/ui-tests/async-errors.stderr b/crates/macro/ui-tests/async-errors.stderr index 19f97ffa..cb734ada 100644 --- a/crates/macro/ui-tests/async-errors.stderr +++ b/crates/macro/ui-tests/async-errors.stderr @@ -46,5 +46,3 @@ error[E0277]: the trait bound `std::result::Result as wasm_bindgen::__rt::IntoJsResult> as wasm_bindgen::__rt::IntoJsResult> = note: required by `wasm_bindgen::__rt::IntoJsResult::into_js_result` - -For more information about this error, try `rustc --explain E0277`. diff --git a/crates/macro/ui-tests/attribute-fails-to-parse.stderr b/crates/macro/ui-tests/attribute-fails-to-parse.stderr index 46b15fae..dfe9ecf0 100644 --- a/crates/macro/ui-tests/attribute-fails-to-parse.stderr +++ b/crates/macro/ui-tests/attribute-fails-to-parse.stderr @@ -3,5 +3,3 @@ error: unknown attribute | 3 | #[wasm_bindgen(nonsense)] | ^^^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/bad-signatures.stderr b/crates/macro/ui-tests/bad-signatures.stderr index 9fcf03ae..48d8d40d 100644 --- a/crates/macro/ui-tests/bad-signatures.stderr +++ b/crates/macro/ui-tests/bad-signatures.stderr @@ -15,5 +15,3 @@ error: cannot return references in #[wasm_bindgen] imports yet | 10 | fn foo() -> &u32; | ^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/import-local.stderr b/crates/macro/ui-tests/import-local.stderr index 1b56da2e..707b30fc 100644 --- a/crates/macro/ui-tests/import-local.stderr +++ b/crates/macro/ui-tests/import-local.stderr @@ -9,5 +9,3 @@ error: relative module paths aren't supported yet | 8 | #[wasm_bindgen(module = "../foo.js")] | ^^^^^^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/invalid-attr.stderr b/crates/macro/ui-tests/invalid-attr.stderr index 043f8773..47264acd 100644 --- a/crates/macro/ui-tests/invalid-attr.stderr +++ b/crates/macro/ui-tests/invalid-attr.stderr @@ -15,5 +15,3 @@ error: malformed #[wasm_bindgen] attribute | 11 | #[wasm_bindgen { }] | ^^^^^^^^^^^^^^^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/invalid-enums.stderr b/crates/macro/ui-tests/invalid-enums.stderr index 073715ae..30149f24 100644 --- a/crates/macro/ui-tests/invalid-enums.stderr +++ b/crates/macro/ui-tests/invalid-enums.stderr @@ -21,5 +21,3 @@ error: enums with #[wasm_bindgen] can only support numbers that can be represent | 18 | X = 4294967296, | ^^^^^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/invalid-imports.stderr b/crates/macro/ui-tests/invalid-imports.stderr index 76a46ff4..5b39369b 100644 --- a/crates/macro/ui-tests/invalid-imports.stderr +++ b/crates/macro/ui-tests/invalid-imports.stderr @@ -87,5 +87,3 @@ error: it is currently not sound to use lifetimes in function signatures | 38 | fn f() -> Result<'a>; | ^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/invalid-items.stderr b/crates/macro/ui-tests/invalid-items.stderr index 17d624b0..2df6351b 100644 --- a/crates/macro/ui-tests/invalid-items.stderr +++ b/crates/macro/ui-tests/invalid-items.stderr @@ -63,5 +63,3 @@ error: #[wasm_bindgen] can only be applied to a function, struct, enum, impl, or | 34 | trait X {} | ^^^^^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/invalid-methods.stderr b/crates/macro/ui-tests/invalid-methods.stderr index c749b654..4268864b 100644 --- a/crates/macro/ui-tests/invalid-methods.stderr +++ b/crates/macro/ui-tests/invalid-methods.stderr @@ -65,5 +65,3 @@ warning: unused macro definition | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `#[warn(unused_macros)]` on by default - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/invalid-setter.stderr b/crates/macro/ui-tests/invalid-setter.stderr index 4948fd37..77e1509e 100644 --- a/crates/macro/ui-tests/invalid-setter.stderr +++ b/crates/macro/ui-tests/invalid-setter.stderr @@ -3,5 +3,3 @@ error: setters must start with `set_`, found: a | 9 | fn a(this: &A, b: i32); | ^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/missing-catch.stderr b/crates/macro/ui-tests/missing-catch.stderr index 55444842..e0f29311 100644 --- a/crates/macro/ui-tests/missing-catch.stderr +++ b/crates/macro/ui-tests/missing-catch.stderr @@ -3,6 +3,3 @@ error[E0277]: the trait bound `std::result::Result Result; | ^^^ the trait `wasm_bindgen::convert::traits::FromWasmAbi` is not implemented for `std::result::Result` - -For more information about this error, try `rustc --explain E0277`. -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/non-public-function.stderr b/crates/macro/ui-tests/non-public-function.stderr index 11357d7f..02f2a329 100644 --- a/crates/macro/ui-tests/non-public-function.stderr +++ b/crates/macro/ui-tests/non-public-function.stderr @@ -3,5 +3,3 @@ error: can only #[wasm_bindgen] public functions | 4 | fn foo() {} | ^^^^^^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/pub-not-copy.stderr b/crates/macro/ui-tests/pub-not-copy.stderr index f6a268f6..ff985b19 100644 --- a/crates/macro/ui-tests/pub-not-copy.stderr +++ b/crates/macro/ui-tests/pub-not-copy.stderr @@ -8,5 +8,3 @@ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not sa 4 | pub struct A { 5 | pub field: String, | ^^^^^^ the trait `std::marker::Copy` is not implemented for `std::string::String` - -For more information about this error, try `rustc --explain E0277`. diff --git a/crates/macro/ui-tests/start-function.stderr b/crates/macro/ui-tests/start-function.stderr index d0f32968..43d845f9 100644 --- a/crates/macro/ui-tests/start-function.stderr +++ b/crates/macro/ui-tests/start-function.stderr @@ -9,5 +9,3 @@ error: the start function cannot have generics | 10 | pub fn foo3() {} | ^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/structural-and-final.stderr b/crates/macro/ui-tests/structural-and-final.stderr index a5e1ca8a..8c8a7038 100644 --- a/crates/macro/ui-tests/structural-and-final.stderr +++ b/crates/macro/ui-tests/structural-and-final.stderr @@ -3,5 +3,3 @@ error: cannot specify both `structural` and `final` | 7 | #[wasm_bindgen(method, structural, final)] | ^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/traits-not-implemented.stderr b/crates/macro/ui-tests/traits-not-implemented.stderr index eb7b1880..b842474d 100644 --- a/crates/macro/ui-tests/traits-not-implemented.stderr +++ b/crates/macro/ui-tests/traits-not-implemented.stderr @@ -3,6 +3,3 @@ error[E0277]: the trait bound `A: wasm_bindgen::convert::traits::IntoWasmAbi` is | 8 | pub fn foo(a: A); | ^^^ the trait `wasm_bindgen::convert::traits::IntoWasmAbi` is not implemented for `A` - -For more information about this error, try `rustc --explain E0277`. -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/unknown-type-in-import.stderr b/crates/macro/ui-tests/unknown-type-in-import.stderr index 8ae20621..9ea716f7 100644 --- a/crates/macro/ui-tests/unknown-type-in-import.stderr +++ b/crates/macro/ui-tests/unknown-type-in-import.stderr @@ -3,6 +3,3 @@ error[E0412]: cannot find type `A` in this scope | 6 | pub fn foo(a: A); | ^ not found in this scope - -For more information about this error, try `rustc --explain E0412`. -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/crates/macro/ui-tests/unused-attributes.stderr b/crates/macro/ui-tests/unused-attributes.stderr index df774701..12f2c01f 100644 --- a/crates/macro/ui-tests/unused-attributes.stderr +++ b/crates/macro/ui-tests/unused-attributes.stderr @@ -9,5 +9,3 @@ error: unused #[wasm_bindgen] attribute | 8 | #[wasm_bindgen(method)] | ^^^^^^ - -error: could not compile `wasm-bindgen-macro-tests`. diff --git a/src/closure.rs b/src/closure.rs index 0ee94100..eb11e5a9 100644 --- a/src/closure.rs +++ b/src/closure.rs @@ -642,7 +642,7 @@ macro_rules! doit { } } - #[allow(non_snake_case)] + #[allow(non_snake_case, unused_parens)] impl WasmClosureFnOnce<($($var),*), R> for T where T: 'static + FnOnce($($var),*) -> R, $($var: FromWasmAbi + 'static,)*