Skip to content

Commit

Permalink
[ci] Update rust to 1.74 (paritytech#2545)
Browse files Browse the repository at this point in the history
cc paritytech/ci_cd#900

---------

Signed-off-by: Oliver Tale-Yazdi <[email protected]>
Co-authored-by: Dónal Murray <[email protected]>
Co-authored-by: Bastian Köcher <[email protected]>
Co-authored-by: Oliver Tale-Yazdi <[email protected]>
Co-authored-by: command-bot <>
  • Loading branch information
4 people authored Dec 7, 2023
1 parent 92e0dbc commit 9177e44
Show file tree
Hide file tree
Showing 25 changed files with 225 additions and 73 deletions.
3 changes: 1 addition & 2 deletions substrate/bin/node/cli/tests/websocket_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ impl WsServer {
Ok(soketto::Data::Text(len)) => String::from_utf8(buf[..len].to_vec())
.map(Message::Text)
.map_err(|err| Box::new(err) as Box<_>),
Ok(soketto::Data::Binary(len)) => Ok(buf[..len].to_vec())
.map(Message::Binary),
Ok(soketto::Data::Binary(len)) => Ok(Message::Binary(buf[..len].to_vec())),
Err(err) => Err(Box::new(err) as Box<_>),
};
Some((ret, (receiver, buf)))
Expand Down
2 changes: 1 addition & 1 deletion substrate/client/consensus/babe/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ async fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + '
let mut net = net.lock();
net.poll(cx);
for p in net.peers() {
for (h, e) in p.failed_verifications() {
if let Some((h, e)) = p.failed_verifications().into_iter().next() {
panic!("Verification failed for {:?}: {}", h, e);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ error: use of deprecated constant `WhereSection::_w`:
| |_^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`
= note: this error originates in the macro `frame_support::match_and_insert` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `Runtime: Config` is not satisfied
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,34 @@ error[E0412]: cannot find type `RuntimeOrigin` in this scope
--> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:42:23
|
42 | type RuntimeOrigin = RuntimeOrigin;
| ^^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeOrigin`
| ^^^^^^^^^^^^^
|
help: you might have meant to use the associated type
|
42 | type RuntimeOrigin = Self::RuntimeOrigin;
| ++++++

error[E0412]: cannot find type `RuntimeCall` in this scope
--> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:44:21
|
44 | type RuntimeCall = RuntimeCall;
| ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
| ^^^^^^^^^^^
|
help: you might have meant to use the associated type
|
44 | type RuntimeCall = Self::RuntimeCall;
| ++++++

error[E0412]: cannot find type `RuntimeEvent` in this scope
--> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:50:22
|
50 | type RuntimeEvent = RuntimeEvent;
| ^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeEvent`
| ^^^^^^^^^^^^
|
help: you might have meant to use the associated type
|
50 | type RuntimeEvent = Self::RuntimeEvent;
| ++++++

error[E0412]: cannot find type `PalletInfo` in this scope
--> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:56:20
Expand All @@ -54,7 +69,7 @@ error[E0412]: cannot find type `PalletInfo` in this scope
help: you might have meant to use the associated type
|
56 | type PalletInfo = Self::PalletInfo;
| ~~~~~~~~~~~~~~~~
| ++++++
help: consider importing one of these items
|
18 + use frame_benchmarking::__private::traits::PalletInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ error[E0412]: cannot find type `RuntimeCall` in this scope
--> tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs:30:10
|
30 | type RuntimeCall = ();
| ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
| ^^^^^^^^^^^
...
35 | #[derive_impl(Pallet)] // Injects type RuntimeCall = RuntimeCall;
| ---------------------- in this macro invocation
|
= note: this error originates in the macro `Pallet` which comes from the expansion of the macro `frame_support::macro_magic::forward_tokens_verbatim` (in Nightly builds, run with -Z macro-backtrace for more info)
help: you might have meant to use the associated type
|
30 | type Self::RuntimeCall = ();
| ++++++
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
| ^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
--> tests/pallet_ui/call_argument_invalid_bound.rs:38:36
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
| ^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
--> tests/pallet_ui/call_argument_invalid_bound_2.rs:38:36
Expand Down Expand Up @@ -45,9 +46,9 @@ error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeEncode` is
= note: required for `<T as pallet::Config>::Bar` to implement `Encode`

error[E0277]: the trait bound `<T as pallet::Config>::Bar: WrapperTypeDecode` is not satisfied
--> tests/pallet_ui/call_argument_invalid_bound_2.rs:34:12
--> tests/pallet_ui/call_argument_invalid_bound_2.rs:38:42
|
34 | #[pallet::call]
| ^^^^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
38 | pub fn foo(origin: OriginFor<T>, _bar: T::Bar) -> DispatchResultWithPostInfo {
| ^^^^^^ the trait `WrapperTypeDecode` is not implemented for `<T as pallet::Config>::Bar`
|
= note: required for `<T as pallet::Config>::Bar` to implement `Decode`
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
| ^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
--> tests/pallet_ui/call_argument_invalid_bound_3.rs:40:36
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_0::_w`:
| ^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_1::_w`:
It is deprecated to use implicit call indices.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
| ^^^^^^^^^^^^^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
| ^^^^^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
| ^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error: use of deprecated constant `pallet::warnings::ConstantWeight_1::_w`:
It is deprecated to use hard-coded constant as call weight.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ error: unused import: `frame_system::pallet_prelude::*`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D unused-imports` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(unused_imports)]`
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ error: use of deprecated constant `pallet::warnings::UncheckedWeightWitness_0::_
| ^^^^^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ error: use of deprecated struct `pallet::_::Store`:
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_0::_w`:
| ^^^^^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
It is deprecated to use hard-coded constant as call weight.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ error: use of deprecated constant `pallet::warnings::ImplicitCallIndex_0::_w`:
| ^^^^^^^
|
= note: `-D deprecated` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(deprecated)]`

error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
It is deprecated to use hard-coded constant as call weight.
Expand All @@ -26,8 +27,15 @@ error: use of deprecated constant `pallet::warnings::ConstantWeight_0::_w`:
error[E0277]: the trait bound `Vec<u8>: MaxEncodedLen` is not satisfied
--> tests/pallet_ui/dev_mode_without_arg_max_encoded_len.rs:28:12
|
28 | #[pallet::pallet]
| ^^^^^^ the trait `MaxEncodedLen` is not implemented for `Vec<u8>`
28 | #[pallet::pallet]
| _______________^
29 | | pub struct Pallet<T>(_);
30 | |
31 | | // Your Pallet's configuration trait, representing custom external types and interfaces.
... |
35 | | #[pallet::storage]
36 | | type MyStorage<T: Config> = StorageValue<_, Vec<u8>>;
| |__________________^ the trait `MaxEncodedLen` is not implemented for `Vec<u8>`
|
= help: the following other types implement trait `MaxEncodedLen`:
bool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error[E0277]: the trait bound `MyError: PalletError` is not satisfied
--> tests/pallet_ui/error_does_not_derive_pallet_error.rs:18:1
--> tests/pallet_ui/error_does_not_derive_pallet_error.rs:28:15
|
18 | #[frame_support::pallet]
| ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `PalletError` is not implemented for `MyError`
28 | CustomError(crate::MyError),
| ^^^^^^^^^^^^^^ the trait `PalletError` is not implemented for `MyError`
|
= help: the following other types implement trait `PalletError`:
bool
Expand All @@ -14,4 +14,3 @@ error[E0277]: the trait bound `MyError: PalletError` is not satisfied
u8
u16
and $N others
= note: this error originates in the derive macro `frame_support::PalletError` (in Nightly builds, run with -Z macro-backtrace for more info)
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:27:12
|
27 | #[pallet::without_storage_info]
| ^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
27 | #[pallet::without_storage_info]
| _______________^
28 | | pub struct Pallet<T>(core::marker::PhantomData<T>);
29 | |
30 | | #[pallet::hooks]
... |
38 | | #[pallet::storage]
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `WrapperTypeDecode` is not implemented for `Bar`
|
= help: the following other types implement trait `WrapperTypeDecode`:
Box<T>
Expand All @@ -16,8 +23,15 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:27:12
|
27 | #[pallet::without_storage_info]
| ^^^^^^^^^^^^^^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
27 | #[pallet::without_storage_info]
| _______________^
28 | | pub struct Pallet<T>(core::marker::PhantomData<T>);
29 | |
30 | | #[pallet::hooks]
... |
38 | | #[pallet::storage]
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `EncodeLike` is not implemented for `Bar`
|
= help: the following other types implement trait `EncodeLike<T>`:
<bool as EncodeLike>
Expand All @@ -36,8 +50,15 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:27:12
|
27 | #[pallet::without_storage_info]
| ^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
27 | #[pallet::without_storage_info]
| _______________^
28 | | pub struct Pallet<T>(core::marker::PhantomData<T>);
29 | |
30 | | #[pallet::hooks]
... |
38 | | #[pallet::storage]
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `WrapperTypeEncode` is not implemented for `Bar`
|
= help: the following other types implement trait `WrapperTypeEncode`:
Box<T>
Expand All @@ -57,8 +78,10 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
38 | #[pallet::storage]
| ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `TypeInfo` is not implemented for `Bar`
|
= help: the following other types implement trait `TypeInfo`:
bool
Expand All @@ -76,8 +99,10 @@ error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
38 | #[pallet::storage]
| ^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `WrapperTypeDecode` is not implemented for `Bar`
|
= help: the following other types implement trait `WrapperTypeDecode`:
Box<T>
Expand All @@ -91,8 +116,10 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
38 | #[pallet::storage]
| ^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `EncodeLike` is not implemented for `Bar`
|
= help: the following other types implement trait `EncodeLike<T>`:
<bool as EncodeLike>
Expand All @@ -111,8 +138,10 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
38 | #[pallet::storage]
| ^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `WrapperTypeEncode` is not implemented for `Bar`
|
= help: the following other types implement trait `WrapperTypeEncode`:
Box<T>
Expand All @@ -130,10 +159,12 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
= note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `StorageEntryMetadataBuilder`

error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:18:1
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
18 | #[frame_support::pallet]
| ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `WrapperTypeDecode` is not implemented for `Bar`
|
= help: the following other types implement trait `WrapperTypeDecode`:
Box<T>
Expand All @@ -143,13 +174,14 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
= note: required for `Bar` to implement `Decode`
= note: required for `Bar` to implement `FullCodec`
= note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
= note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:18:1
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
18 | #[frame_support::pallet]
| ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `EncodeLike` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `EncodeLike` is not implemented for `Bar`
|
= help: the following other types implement trait `EncodeLike<T>`:
<bool as EncodeLike>
Expand All @@ -164,13 +196,14 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
= note: required for `Bar` to implement `FullEncode`
= note: required for `Bar` to implement `FullCodec`
= note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
= note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:18:1
--> tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.rs:38:12
|
18 | #[frame_support::pallet]
| ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeEncode` is not implemented for `Bar`
38 | #[pallet::storage]
| _______________^
39 | | type Foo<T> = StorageValue<Value = Bar>;
| |____________^ the trait `WrapperTypeEncode` is not implemented for `Bar`
|
= help: the following other types implement trait `WrapperTypeEncode`:
Box<T>
Expand All @@ -186,4 +219,3 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
= note: required for `Bar` to implement `FullEncode`
= note: required for `Bar` to implement `FullCodec`
= note: required for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>` to implement `TryDecodeEntireStorage`
= note: this error originates in the attribute macro `frame_support::pallet` (in Nightly builds, run with -Z macro-backtrace for more info)
Loading

0 comments on commit 9177e44

Please sign in to comment.