Bump trybuild and adapt test fixtures (#1006)

use-ink · Nov 8, 2021 · 1393502 · 1393502
1 parent e26c350
commit 1393502
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/crates/lang/Cargo.toml b/crates/lang/Cargo.toml
@@ -30,7 +30,7 @@ derive_more = { version = "0.99", default-features = false, features = ["from"]
 ink_lang_ir = { version = "3.0.0-rc6", path = "ir" }
 ink_metadata = { version = "3.0.0-rc6", default-features = false, path = "../metadata" }
 
-trybuild = { version = "1.0.49", features = ["diff"] }
+trybuild = { version = "1.0.52", features = ["diff"] }
 # Required for the doctest of `env_access::EnvAccess::instantiate_contract`
 scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 

diff --git a/crates/lang/tests/ui/contract/fail/constructor-input-non-codec.stderr b/crates/lang/tests/ui/contract/fail/constructor-input-non-codec.stderr
@@ -24,18 +24,14 @@ note: required by a bound in `parity_scale_codec::Decode::decode`
    --> $CARGO/parity-scale-codec-2.3.1/src/codec.rs
     |
     |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
-    |               ^ required by this bound in `parity_scale_codec::Decode::decode`
+    |                  ^^^^^ required by this bound in `parity_scale_codec::Decode::decode`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
-  --> tests/ui/contract/fail/constructor-input-non-codec.rs:3:1
+  --> tests/ui/contract/fail/constructor-input-non-codec.rs:13:9
    |
-3  |   #[ink::contract]
-   |   ^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
-...
 13 | /         pub fn constructor(_input: NonCodecType) -> Self {
 14 | |             Self {}
 15 | |         }
-   | |_________- required by a bound introduced by this call
+   | |_________^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
    |
    = note: required because of the requirements on the impl of `Encode` for `NonCodecType`
-   = note: this error originates in the attribute macro `ink::contract` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/crates/lang/tests/ui/contract/fail/message-input-non-codec.stderr b/crates/lang/tests/ui/contract/fail/message-input-non-codec.stderr
@@ -6,9 +6,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
    |
    = note: required because of the requirements on the impl of `parity_scale_codec::Decode` for `NonCodecType`
 note: required by a bound in `DispatchInput`
-  --> src/codegen/dispatch/type_check.rs:41:8
+  --> src/codegen/dispatch/type_check.rs
    |
-41 |     T: scale::Decode + 'static;
+   |     T: scale::Decode + 'static;
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
@@ -22,19 +22,15 @@ note: required by a bound in `parity_scale_codec::Decode::decode`
    --> $CARGO/parity-scale-codec-2.3.1/src/codec.rs
     |
     |     fn decode<I: Input>(input: &mut I) -> Result<Self, Error>;
-    |               ^ required by this bound in `parity_scale_codec::Decode::decode`
+    |                  ^^^^^ required by this bound in `parity_scale_codec::Decode::decode`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
-  --> tests/ui/contract/fail/message-input-non-codec.rs:3:1
+  --> tests/ui/contract/fail/message-input-non-codec.rs:18:9
    |
-3  | #[ink::contract]
-   | ^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
-...
 18 |         pub fn message(&self, _input: NonCodecType) {}
-   |         ---------------------------------------------- required by a bound introduced by this call
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
    |
    = note: required because of the requirements on the impl of `Encode` for `NonCodecType`
-   = note: this error originates in the attribute macro `ink::contract` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: the method `fire` exists for struct `ink_env::call::CallBuilder<DefaultEnvironment, Set<ink_env::AccountId>, Unset<u64>, Unset<u128>, Set<ExecutionInput<ArgumentList<ink_env::call::utils::Argument<NonCodecType>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>>>, Set<()>>`, but its trait bounds were not satisfied
   --> tests/ui/contract/fail/message-input-non-codec.rs:18:9

diff --git a/crates/lang/tests/ui/contract/fail/message-returns-non-codec.stderr b/crates/lang/tests/ui/contract/fail/message-returns-non-codec.stderr
@@ -6,9 +6,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
    |
    = note: required because of the requirements on the impl of `Encode` for `NonCodecType`
 note: required by a bound in `DispatchOutput`
-  --> src/codegen/dispatch/type_check.rs
+  --> src/codegen/dispatch/type_check.rs:69:8
    |
-   |     T: scale::Encode + 'static;
+69 |     T: scale::Encode + 'static;
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchOutput`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
@@ -21,9 +21,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
     |
     = note: required because of the requirements on the impl of `Encode` for `NonCodecType`
 note: required by a bound in `finalize_message`
-   --> src/codegen/dispatch/execution.rs
+   --> src/codegen/dispatch/execution.rs:169:8
     |
-    |     R: scale::Encode + 'static,
+169 |     R: scale::Encode + 'static,
     |        ^^^^^^^^^^^^^ required by this bound in `finalize_message`
 
 error[E0599]: the method `fire` exists for struct `ink_env::call::CallBuilder<DefaultEnvironment, Set<ink_env::AccountId>, Unset<u64>, Unset<u128>, Set<ExecutionInput<ArgumentList<ArgumentListEnd, ArgumentListEnd>>>, Set<ReturnType<NonCodecType>>>`, but its trait bounds were not satisfied

diff --git a/crates/lang/tests/ui/trait_def/fail/message_input_non_codec.stderr b/crates/lang/tests/ui/trait_def/fail/message_input_non_codec.stderr
@@ -6,9 +6,9 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeDecode` is not satisfied
    |
    = note: required because of the requirements on the impl of `parity_scale_codec::Decode` for `NonCodec`
 note: required by a bound in `DispatchInput`
-  --> src/codegen/dispatch/type_check.rs:41:8
+  --> src/codegen/dispatch/type_check.rs
    |
-41 |     T: scale::Decode + 'static;
+   |     T: scale::Decode + 'static;
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
 error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied