Updated stderr test files.

CoinFabrik · Oct 27, 2023 · 2d1950a · 2d1950a
1 parent 3ccb01f
commit 2d1950a
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 85 deletions.
diff --git a/crates/ink/tests/ui/contract/fail/constructor-input-non-codec.stderr b/crates/ink/tests/ui/contract/fail/constructor-input-non-codec.stderr
@@ -5,16 +5,13 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
    |                            ^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
+             Arc<T>
              Box<T>
              Rc<T>
-             Arc<T>
    = note: required for `NonCodecType` to implement `ink::parity_scale_codec::Decode`
 note: required by a bound in `DispatchInput`
   --> src/codegen/dispatch/type_check.rs
    |
-   | pub struct DispatchInput<T>(T)
-   |            ------------- required by a bound in this struct
-   | where
    |     T: scale::Decode + 'static;
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
@@ -25,9 +22,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
    |         ^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
+             Arc<T>
              Box<T>
              Rc<T>
-             Arc<T>
    = note: required for `NonCodecType` to implement `ink::parity_scale_codec::Decode`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
@@ -40,21 +37,18 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
    |         --- required by a bound introduced by this call
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
+             &T
+             &mut T
+             Arc<T>
              Box<T>
              Cow<'a, T>
-             ink::parity_scale_codec::Ref<'a, T, U>
              Rc<T>
-             Arc<T>
-             Vec<T>
              String
-             &T
-             &mut T
+             Vec<T>
+             ink::parity_scale_codec::Ref<'a, T, U>
    = note: required for `NonCodecType` to implement `Encode`
 note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
   --> $WORKSPACE/crates/env/src/call/execution_input.rs
    |
-   |     pub fn push_arg<T>(
-   |            -------- required by a bound in this associated function
-...
    |         T: scale::Encode,
    |            ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
diff --git a/crates/ink/tests/ui/contract/fail/constructor-return-result-invalid.stderr b/crates/ink/tests/ui/contract/fail/constructor-return-result-invalid.stderr
@@ -5,5 +5,5 @@ error[E0277]: the trait bound `ConstructorOutputValue<Result<u8, contract::Error
    |         ^^^ the trait `ConstructorOutput<Contract>` is not implemented for `ConstructorOutputValue<Result<u8, contract::Error>>`
    |
    = help: the following other types implement trait `ConstructorOutput<C>`:
-             ConstructorOutputValue<Result<C, E>>
              ConstructorOutputValue<C>
+             ConstructorOutputValue<Result<C, E>>
diff --git a/crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr b/crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr
@@ -8,9 +8,6 @@ error[E0277]: the trait bound `Result<Result<(), &contract::Error>, LangError>:
 note: required by a bound in `return_value`
   --> $WORKSPACE/crates/env/src/api.rs
    |
-   | pub fn return_value<R>(return_flags: ReturnFlags, return_value: &R) -> !
-   |        ------------ required by a bound in this function
-   | where
    |     R: scale::Encode,
    |        ^^^^^^^^^^^^^ required by this bound in `return_value`
 
@@ -21,17 +18,14 @@ error[E0277]: the trait bound `contract::Error: WrapperTypeDecode` is not satisf
    |         ^^^ the trait `WrapperTypeDecode` is not implemented for `contract::Error`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
+             Arc<T>
              Box<T>
              Rc<T>
-             Arc<T>
    = note: required for `contract::Error` to implement `ink::parity_scale_codec::Decode`
    = note: required for `Result<ContractRef, contract::Error>` to implement `ConstructorReturnType<ContractRef>`
 note: required by a bound in `CreateBuilder::<E, ContractRef, CodeHash, GasLimit, Endowment, Args, Salt, Unset<ReturnType<()>>>::returns`
   --> $WORKSPACE/crates/env/src/call/create_builder.rs
    |
-   |     pub fn returns<R>(
-   |            ------- required by a bound in this associated function
-...
    |         R: ConstructorReturnType<ContractRef>,
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `CreateBuilder::<E, ContractRef, CodeHash, GasLimit, Endowment, Args, Salt, Unset<ReturnType<()>>>::returns`
 
@@ -42,23 +36,20 @@ error[E0277]: the trait bound `contract::Error: TypeInfo` is not satisfied
   |                ^^^^^^^^ the trait `TypeInfo` is not implemented for `contract::Error`
   |
   = help: the following other types implement trait `TypeInfo`:
-            bool
-            char
-            i8
-            i16
-            i32
-            i64
-            i128
-            u8
+            &T
+            &mut T
+            ()
+            (A, B)
+            (A, B, C)
+            (A, B, C, D)
+            (A, B, C, D, E)
+            (A, B, C, D, E, F)
           and $N others
   = note: required for `Result<(), contract::Error>` to implement `TypeInfo`
   = note: 1 redundant requirement hidden
   = note: required for `Result<Result<(), contract::Error>, LangError>` to implement `TypeInfo`
 note: required by a bound in `TypeSpec::with_name_str`
  --> $WORKSPACE/crates/metadata/src/specs.rs
   |
-  |     pub fn with_name_str<T>(display_name: &'static str) -> Self
-  |            ------------- required by a bound in this associated function
-  |     where
   |         T: TypeInfo + 'static,
   |            ^^^^^^^^ required by this bound in `TypeSpec::with_name_str`
diff --git a/crates/ink/tests/ui/contract/fail/constructor-self-receiver-03.stderr b/crates/ink/tests/ui/contract/fail/constructor-self-receiver-03.stderr
@@ -29,7 +29,7 @@ error[E0277]: the trait bound `&Contract: WrapperTypeDecode` is not satisfied
   |         ^^^ the trait `WrapperTypeDecode` is not implemented for `&Contract`
   |
   = help: the following other types implement trait `WrapperTypeDecode`:
+            Arc<T>
             Box<T>
             Rc<T>
-            Arc<T>
   = note: required for `&Contract` to implement `ink::parity_scale_codec::Decode`
diff --git a/crates/ink/tests/ui/contract/fail/message-input-non-codec.stderr b/crates/ink/tests/ui/contract/fail/message-input-non-codec.stderr
@@ -5,16 +5,13 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
    |                               ^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
+             Arc<T>
              Box<T>
              Rc<T>
-             Arc<T>
    = note: required for `NonCodecType` to implement `ink::parity_scale_codec::Decode`
 note: required by a bound in `DispatchInput`
   --> src/codegen/dispatch/type_check.rs
    |
-   | pub struct DispatchInput<T>(T)
-   |            ------------- required by a bound in this struct
-   | where
    |     T: scale::Decode + 'static;
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
@@ -25,9 +22,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
    |         ^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodecType`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
+             Arc<T>
              Box<T>
              Rc<T>
-             Arc<T>
    = note: required for `NonCodecType` to implement `ink::parity_scale_codec::Decode`
 
 error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
@@ -40,22 +37,19 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
    |         --- required by a bound introduced by this call
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
+             &T
+             &mut T
+             Arc<T>
              Box<T>
              Cow<'a, T>
-             ink::parity_scale_codec::Ref<'a, T, U>
              Rc<T>
-             Arc<T>
-             Vec<T>
              String
-             &T
-             &mut T
+             Vec<T>
+             ink::parity_scale_codec::Ref<'a, T, U>
    = note: required for `NonCodecType` to implement `Encode`
 note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
   --> $WORKSPACE/crates/env/src/call/execution_input.rs
    |
-   |     pub fn push_arg<T>(
-   |            -------- required by a bound in this associated function
-...
    |         T: scale::Encode,
    |            ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
 
@@ -71,4 +65,4 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder<DefaultEnvi
    | ----------------------------------- doesn't satisfy `_: Encode`
    |
    = note: the following trait bounds were not satisfied:
-           `ArgumentList<Argument<NonCodecType>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
+           `ArgumentList<ink::ink_env::call::utils::Argument<NonCodecType>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
diff --git a/crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr b/crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr
@@ -5,22 +5,19 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
    |                                  ^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonCodecType`
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
+             &T
+             &mut T
+             Arc<T>
              Box<T>
              Cow<'a, T>
-             ink::parity_scale_codec::Ref<'a, T, U>
              Rc<T>
-             Arc<T>
-             Vec<T>
              String
-             &T
-             &mut T
+             Vec<T>
+             ink::parity_scale_codec::Ref<'a, T, U>
    = note: required for `NonCodecType` to implement `Encode`
 note: required by a bound in `DispatchOutput`
   --> src/codegen/dispatch/type_check.rs
    |
-   | pub struct DispatchOutput<T>(T)
-   |            -------------- required by a bound in this struct
-   | where
    |     T: scale::Encode + 'static;
    |        ^^^^^^^^^^^^^ required by this bound in `DispatchOutput`
 
@@ -34,9 +31,6 @@ error[E0277]: the trait bound `Result<NonCodecType, LangError>: Encode` is not s
 note: required by a bound in `return_value`
   --> $WORKSPACE/crates/env/src/api.rs
    |
-   | pub fn return_value<R>(return_flags: ReturnFlags, return_value: &R) -> !
-   |        ------------ required by a bound in this function
-   | where
    |     R: scale::Encode,
    |        ^^^^^^^^^^^^^ required by this bound in `return_value`
 

diff --git a/crates/ink/tests/ui/storage_item/fail/packed_is_not_derived_automatically.stderr b/crates/ink/tests/ui/storage_item/fail/packed_is_not_derived_automatically.stderr
@@ -5,9 +5,9 @@ error[E0277]: the trait bound `NonPacked: WrapperTypeDecode` is not satisfied
    |                              ^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonPacked`
    |
    = help: the following other types implement trait `WrapperTypeDecode`:
+             Arc<T>
              Box<T>
              Rc<T>
-             Arc<T>
    = note: required for `NonPacked` to implement `ink::parity_scale_codec::Decode`
    = note: required for `NonPacked` to implement `Packed`
 note: required by a bound in `consume_packed`
@@ -23,15 +23,15 @@ error[E0277]: the trait bound `NonPacked: WrapperTypeEncode` is not satisfied
    |                              ^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonPacked`
    |
    = help: the following other types implement trait `WrapperTypeEncode`:
+             &T
+             &mut T
+             Arc<T>
              Box<T>
              Cow<'a, T>
-             ink::parity_scale_codec::Ref<'a, T, U>
              Rc<T>
-             Arc<T>
-             Vec<T>
              String
-             &T
-             &mut T
+             Vec<T>
+             ink::parity_scale_codec::Ref<'a, T, U>
    = note: required for `NonPacked` to implement `Encode`
    = note: required for `NonPacked` to implement `Packed`
 note: required by a bound in `consume_packed`

diff --git a/crates/ink/tests/ui/trait_def/fail/message_input_non_codec.stderr b/crates/ink/tests/ui/trait_def/fail/message_input_non_codec.stderr
@@ -5,16 +5,13 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeDecode` is not satisfied
   |                       ^^^^^ the trait `WrapperTypeDecode` is not implemented for `NonCodec`
   |
   = help: the following other types implement trait `WrapperTypeDecode`:
+            Arc<T>
             Box<T>
             Rc<T>
-            Arc<T>
   = note: required for `NonCodec` to implement `ink::parity_scale_codec::Decode`
 note: required by a bound in `DispatchInput`
  --> src/codegen/dispatch/type_check.rs
   |
-  | pub struct DispatchInput<T>(T)
-  |            ------------- required by a bound in this struct
-  | where
   |     T: scale::Decode + 'static;
   |        ^^^^^^^^^^^^^ required by this bound in `DispatchInput`
 
@@ -28,22 +25,19 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
   |     - required by a bound introduced by this call
   |
   = help: the following other types implement trait `WrapperTypeEncode`:
+            &T
+            &mut T
+            Arc<T>
             Box<T>
             Cow<'a, T>
-            ink::parity_scale_codec::Ref<'a, T, U>
             Rc<T>
-            Arc<T>
-            Vec<T>
             String
-            &T
-            &mut T
+            Vec<T>
+            ink::parity_scale_codec::Ref<'a, T, U>
   = note: required for `NonCodec` to implement `Encode`
 note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
  --> $WORKSPACE/crates/env/src/call/execution_input.rs
   |
-  |     pub fn push_arg<T>(
-  |            -------- required by a bound in this associated function
-...
   |         T: scale::Encode,
   |            ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
 
@@ -59,4 +53,4 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder<E, Set<Call
   | ----------------------------------- doesn't satisfy `_: Encode`
   |
   = note: the following trait bounds were not satisfied:
-          `ArgumentList<Argument<NonCodec>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
+          `ArgumentList<ink::ink_env::call::utils::Argument<NonCodec>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
diff --git a/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr b/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr
@@ -5,22 +5,19 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
   |                          ^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `NonCodec`
   |
   = help: the following other types implement trait `WrapperTypeEncode`:
+            &T
+            &mut T
+            Arc<T>
             Box<T>
             Cow<'a, T>
-            ink::parity_scale_codec::Ref<'a, T, U>
             Rc<T>
-            Arc<T>
-            Vec<T>
             String
-            &T
-            &mut T
+            Vec<T>
+            ink::parity_scale_codec::Ref<'a, T, U>
   = note: required for `NonCodec` to implement `Encode`
 note: required by a bound in `DispatchOutput`
  --> src/codegen/dispatch/type_check.rs
   |
-  | pub struct DispatchOutput<T>(T)
-  |            -------------- required by a bound in this struct
-  | where
   |     T: scale::Encode + 'static;
   |        ^^^^^^^^^^^^^ required by this bound in `DispatchOutput`