Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

ci: bump ci image for rust 1.70 #14399

Merged
merged 3 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@ rustflags = [
"-Aclippy::needless_option_as_deref", # false positives
"-Aclippy::derivable_impls", # false positives
"-Aclippy::stable_sort_primitive", # prefer stable sort
"-Aclippy::extra-unused-type-parameters" # stylistic
"-Aclippy::extra-unused-type-parameters", # stylistic
"-Aclippy::let_with_type_underscore" # used as a workaround for an infinite macro expansion loop in clippy
# specifying this as an attribute directly in the affected macro
# triggers other weird rust 1.70 bugs
]
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ variables:
CARGO_INCREMENTAL: 0
DOCKER_OS: "debian:bullseye"
ARCH: "x86_64"
CI_IMAGE: "paritytech/ci-linux:production"
CI_IMAGE: "paritytech/ci-linux@sha256:c725397b3edef45ad8dfa6a829b35e7c908b74ed532929bb6ad24cca1129dc8e" # ci-linux:1.70.0-bullseye 2023-06-19
ggwpez marked this conversation as resolved.
Show resolved Hide resolved
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
RELENG_SCRIPTS_BRANCH: "master"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ help: you might have meant to use the associated type
| ~~~~~~~~~~~~~~~~
help: consider importing this trait
|
1 | use frame_support::traits::PalletInfo;
1 + use frame_support::traits::PalletInfo;
|
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ error[E0412]: cannot find type `Event` in module `pallet`
= note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
help: consider importing one of these items
|
1 | use frame_support_test::Event;
1 + use frame_support_test::Event;
|
1 | use frame_system::Event;
1 + use frame_system::Event;
|
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ error[E0412]: cannot find type `GenesisConfig` in module `pallet`
= note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
help: consider importing one of these items
|
1 | use frame_system::GenesisConfig;
1 + use frame_system::GenesisConfig;
|
1 | use test_pallet::GenesisConfig;
1 + use test_pallet::GenesisConfig;
|
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ error[E0412]: cannot find type `Origin` in module `pallet`
= note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
help: consider importing one of these items
|
1 | use frame_support_test::Origin;
1 + use frame_support_test::Origin;
|
1 | use frame_system::Origin;
1 + use frame_system::Origin;
|
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0433]: failed to resolve: use of undeclared type `Insect`
error[E0405]: cannot find trait `Insect` in this scope
--> tests/derive_impl_ui/bad_disambiguation_path.rs:38:35
|
38 | #[derive_impl(FourLeggedAnimal as Insect)]
| ^^^^^^ use of undeclared type `Insect`
| ^^^^^^ not found in this scope
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ error[E0277]: `Bar` doesn't implement `std::fmt::Debug`
= note: required for the cast from `&Bar` to the object type `dyn std::fmt::Debug`
help: consider annotating `Bar` with `#[derive(Debug)]`
|
17 | #[derive(Debug)]
17 + #[derive(Debug)]
18 | struct Bar;
|
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ note: required by a bound in `GenesisBuild`
| ^^^^^^^ required by this bound in `GenesisBuild`
help: consider annotating `pallet::GenesisConfig` with `#[derive(Default)]`
|
19 | #[derive(Default)]
19 + #[derive(Default)]
20 | pub struct GenesisConfig;
|
6 changes: 0 additions & 6 deletions primitives/api/test/tests/ui/impl_missing_version.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
error[E0433]: failed to resolve: could not find `ApiV4` in `runtime_decl_for_api`
--> tests/ui/impl_missing_version.rs:18:13
|
18 | impl self::Api<Block> for Runtime {
| ^^^ could not find `ApiV4` in `runtime_decl_for_api`

error[E0405]: cannot find trait `ApiV4` in module `self::runtime_decl_for_api`
--> tests/ui/impl_missing_version.rs:18:13
|
Expand Down