ci: bump ci image for rust 1.70 (paritytech#14399)

* ci: bump ci image for rust 1.70 * ".git/.scripts/commands/update-ui/update-ui.sh" 1.70 * chore: ignore the new let_with_type_underscore lint --------- Co-authored-by: command-bot <>
nathanwhit · Jul 19, 2023 · dbc6a8f · dbc6a8f
1 parent 708009d
commit dbc6a8f
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -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
 ]
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -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
   BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   RELENG_SCRIPTS_BRANCH: "master"

diff --git a/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr b/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr
@@ -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;
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr
@@ -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;
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr
@@ -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;
    |
diff --git a/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr b/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr
@@ -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;
    |
diff --git a/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.stderr b/frame/support/test/tests/derive_impl_ui/bad_disambiguation_path.stderr
@@ -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
diff --git a/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr b/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_3.stderr
@@ -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;
    |
diff --git a/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr b/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr
@@ -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;
     |
diff --git a/primitives/api/test/tests/ui/impl_missing_version.stderr b/primitives/api/test/tests/ui/impl_missing_version.stderr
@@ -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
    |