Adapt test fixtures for nightly-2021-11-21 (#1033)

use-ink · Nov 23, 2021 · 259d25c · 259d25c
1 parent 994d28a
commit 259d25c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 33 deletions.
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
@@ -6,25 +6,20 @@ 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
-   --> tests/ui/contract/fail/constructor-input-non-codec.rs:13:9
-    |
-13  | /         pub fn constructor(_input: NonCodecType) -> Self {
-14  | |             Self {}
-15  | |         }
-    | |_________^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
-    |
-    = note: required because of the requirements on the impl of `parity_scale_codec::Decode` for `NonCodecType`
-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`
+  --> tests/ui/contract/fail/constructor-input-non-codec.rs:13:9
+   |
+13 | /         pub fn constructor(_input: NonCodecType) -> Self {
+14 | |             Self {}
+15 | |         }
+   | |_________^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
+   |
+   = note: required because of the requirements on the impl of `parity_scale_codec::Decode` for `NonCodecType`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
   --> tests/ui/contract/fail/constructor-input-non-codec.rs:13:9
@@ -35,3 +30,8 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
    | |_________^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
    |
    = note: required because of the requirements on the impl of `Encode` for `NonCodecType`
+note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
+  --> $WORKSPACE/crates/env/src/call/execution_input.rs
+   |
+   |         T: scale::Encode,
+   |            ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
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
@@ -12,17 +12,12 @@ note: required by a bound in `DispatchInput`
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
-   --> tests/ui/contract/fail/message-input-non-codec.rs:18:9
-    |
-18  |         pub fn message(&self, _input: NonCodecType) {}
-    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
-    |
-    = note: required because of the requirements on the impl of `parity_scale_codec::Decode` for `NonCodecType`
-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`
+  --> tests/ui/contract/fail/message-input-non-codec.rs:18:9
+   |
+18 |         pub fn message(&self, _input: NonCodecType) {}
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
+   |
+   = note: required because of the requirements on the impl of `parity_scale_codec::Decode` for `NonCodecType`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
   --> tests/ui/contract/fail/message-input-non-codec.rs:18:9
@@ -31,6 +26,11 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
    |
    = note: required because of the requirements on the impl of `Encode` for `NonCodecType`
+note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
+  --> $WORKSPACE/crates/env/src/call/execution_input.rs
+   |
+   |         T: scale::Encode,
+   |            ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
 
 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/trait_def/fail/message_input_non_codec.stderr b/crates/lang/tests/ui/trait_def/fail/message_input_non_codec.stderr
@@ -12,13 +12,18 @@ note: required by a bound in `DispatchInput`
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
 error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
- --> tests/ui/trait_def/fail/message_input_non_codec.rs:7:5
-  |
-7 | /     #[ink(message)]
-8 | |     fn message(&self, input: NonCodec);
-  | |_______________________________________^ the trait `WrapperTypeEncode` is not implemented for `NonCodec`
-  |
-  = note: required because of the requirements on the impl of `Encode` for `NonCodec`
+  --> tests/ui/trait_def/fail/message_input_non_codec.rs:7:5
+   |
+7  | /     #[ink(message)]
+8  | |     fn message(&self, input: NonCodec);
+   | |_______________________________________^ the trait `WrapperTypeEncode` is not implemented for `NonCodec`
+   |
+   = note: required because of the requirements on the impl of `Encode` for `NonCodec`
+note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
+  --> $WORKSPACE/crates/env/src/call/execution_input.rs
+   |
+   |         T: scale::Encode,
+   |            ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
 
 error[E0599]: the method `fire` exists for struct `CallBuilder<E, Set<<E as Environment>::AccountId>, Unset<u64>, Unset<<E as Environment>::Balance>, Set<ExecutionInput<ArgumentList<ink_env::call::utils::Argument<NonCodec>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>>>, Set<()>>`, but its trait bounds were not satisfied
   --> tests/ui/trait_def/fail/message_input_non_codec.rs:7:5