Prepare for rust 1.62.1 (#5811)

* Update update-rust-stable script * Update UI tests for rust-1.62.1 * Use staging CI image * pin ci image Co-authored-by: alvicsam <alvicsam@gmail.com>
paritytech · Jul 26, 2022 · ea28afe · ea28afe
1 parent 755d959
commit ea28afe
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 43 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,7 +29,8 @@ variables:
   GIT_STRATEGY:                    fetch
   GIT_DEPTH:                       100
   CI_SERVER_NAME:                  "GitLab CI"
-  CI_IMAGE:                        "paritytech/ci-linux:production"
+  # change to production when this image is published
+  CI_IMAGE:                        "paritytech/ci-linux:staging@sha256:2c90b67f1452ed2d7236c2cd13f6224053a833d521b3630650b679f00874e0a9"
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
   ZOMBIENET_IMAGE:                 "docker.io/paritytech/zombienet:v1.2.25"

diff --git a/node/orchestra/tests/ui/err-01-duplicate-consumer.stderr b/node/orchestra/tests/ui/err-01-duplicate-consumer.stderr
@@ -1,21 +1,21 @@
-error[E0119]: conflicting implementations of trait `orchestra::SubsystemSender<MsgStrukt>` for type `OrchestraSubsystemSender`
+error[E0119]: conflicting implementations of trait `std::convert::From<MsgStrukt>` for type `AllMessages`
   --> tests/ui/err-01-duplicate-consumer.rs:19:1
    |
 19 | #[orchestra(signal=SigSigSig, event=Event, gen=AllMessages, error=OrchestraError)]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    | |
    | first implementation here
-   | conflicting implementation for `OrchestraSubsystemSender`
+   | conflicting implementation for `AllMessages`
    |
    = note: this error originates in the attribute macro `orchestra` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0119]: conflicting implementations of trait `std::convert::From<MsgStrukt>` for type `AllMessages`
+error[E0119]: conflicting implementations of trait `AssociateOutgoing` for type `MsgStrukt`
   --> tests/ui/err-01-duplicate-consumer.rs:19:1
    |
 19 | #[orchestra(signal=SigSigSig, event=Event, gen=AllMessages, error=OrchestraError)]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    | |
    | first implementation here
-   | conflicting implementation for `AllMessages`
+   | conflicting implementation for `MsgStrukt`
    |
    = note: this error originates in the attribute macro `orchestra` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/node/orchestra/tests/ui/err-02-enum.stderr b/node/orchestra/tests/ui/err-02-enum.stderr
@@ -1,11 +1,11 @@
 error: expected `struct`
-  --> $DIR/err-02-enum.rs:16:1
+  --> tests/ui/err-02-enum.rs:16:1
    |
 16 | enum Orchestra {
    | ^^^^
 
 error[E0433]: failed to resolve: use of undeclared type `Orchestra`
-  --> $DIR/err-02-enum.rs:27:17
+  --> tests/ui/err-02-enum.rs:27:18
    |
 27 |     let orchestra = Orchestra::<_,_>::builder()
-   |                    ^^^^^^^^ use of undeclared type `Orchestra`
+   |                     ^^^^^^^^^ use of undeclared type `Orchestra`
diff --git a/node/orchestra/tests/ui/err-03-subsys-twice.stderr b/node/orchestra/tests/ui/err-03-subsys-twice.stderr
@@ -1,17 +1,17 @@
-error: Duplicate subsystem names `AwesomeSubSys`
-  --> $DIR/err-03-subsys-twice.rs:25:8
+error: Duplicate subsystem names
+  --> tests/ui/err-03-subsys-twice.rs:25:8
    |
 25 |     sub1: AwesomeSubSys,
    |           ^^^^^^^^^^^^^
 
 error: previously defined here.
-  --> $DIR/err-03-subsys-twice.rs:22:8
+  --> tests/ui/err-03-subsys-twice.rs:22:8
    |
 22 |     sub0: AwesomeSubSys,
    |           ^^^^^^^^^^^^^
 
 error[E0433]: failed to resolve: use of undeclared type `Orchestra`
-  --> $DIR/err-03-subsys-twice.rs:34:17
+  --> tests/ui/err-03-subsys-twice.rs:34:18
    |
 34 |     let orchestra = Orchestra::<_,_>::builder()
-   |                    ^^^^^^^^ use of undeclared type `Orchestra`
+   |                     ^^^^^^^^^ use of undeclared type `Orchestra`
diff --git a/node/orchestra/tests/ui/err-04-missing-error.stderr b/node/orchestra/tests/ui/err-04-missing-error.stderr
@@ -1,13 +1,13 @@
 error: Must declare the orchestra error type via `error=..`.
-  --> $DIR/err-04-missing-error.rs:16:1
+  --> tests/ui/err-04-missing-error.rs:16:1
    |
 16 | #[orchestra(signal=SigSigSig, event=Event, gen=AllMessages)]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: this error originates in the attribute macro `orchestra` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: use of undeclared type `Orchestra`
-  --> $DIR/err-04-missing-error.rs:30:10
+  --> tests/ui/err-04-missing-error.rs:30:10
    |
 30 |     let _ = Orchestra::builder()
-   |             ^^^^^^^^ use of undeclared type `Orchestra`
+   |             ^^^^^^^^^ use of undeclared type `Orchestra`
diff --git a/node/orchestra/tests/ui/err-05-missing-field.stderr b/node/orchestra/tests/ui/err-05-missing-field.stderr
@@ -2,14 +2,10 @@ error[E0599]: no method named `build` found for struct `OrchestraBuilder<Init<Du
   --> tests/ui/err-05-missing-field.rs:59:4
    |
 22 | #[orchestra(signal=SigSigSig, error=OrchestraError, event=Event, gen=AllMessages)]
-   | -------------------------------------------------------------------------------- method `build` not found for this
+   | ---------------------------------------------------------------------------------- method `build` not found for this struct
 ...
 59 |         .build()
    |          ^^^^^ method not found in `OrchestraBuilder<Init<DummySpawner>, Init<AwesomeSubSys>, Missing<f64>>`
    |
    = note: the method was found for
            - `OrchestraBuilder<Init<S>, Init<AwesomeSubSys>, Init<f64>>`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following traits define an item `build`, perhaps you need to implement one of them:
-           candidate #1: `frame_support::traits::hooks::GenesisBuild`
-           candidate #2: `prometheus::vec::MetricVecBuilder`
diff --git a/node/orchestra/tests/ui/err-06-missing-subsystem.stderr b/node/orchestra/tests/ui/err-06-missing-subsystem.stderr
@@ -2,14 +2,10 @@ error[E0599]: no method named `build` found for struct `OrchestraBuilder<Init<Du
   --> tests/ui/err-06-missing-subsystem.rs:59:4
    |
 22 | #[orchestra(signal=SigSigSig, error=OrchestraError, event=Event, gen=AllMessages)]
-   | -------------------------------------------------------------------------------- method `build` not found for this
+   | ---------------------------------------------------------------------------------- method `build` not found for this struct
 ...
 59 |         .build()
    |          ^^^^^ method not found in `OrchestraBuilder<Init<DummySpawner>, Missing<_>, Init<f64>>`
    |
    = note: the method was found for
            - `OrchestraBuilder<Init<S>, Init<AwesomeSubSys>, Init<f64>>`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following traits define an item `build`, perhaps you need to implement one of them:
-           candidate #1: `frame_support::traits::hooks::GenesisBuild`
-           candidate #2: `prometheus::vec::MetricVecBuilder`
diff --git a/node/orchestra/tests/ui/err-07-missing-spawner.stderr b/node/orchestra/tests/ui/err-07-missing-spawner.stderr
@@ -2,14 +2,10 @@ error[E0599]: no method named `build` found for struct `OrchestraBuilder<Missing
   --> tests/ui/err-07-missing-spawner.rs:59:4
    |
 22 | #[orchestra(signal=SigSigSig, error=OrchestraError, event=Event, gen=AllMessages)]
-   | -------------------------------------------------------------------------------- method `build` not found for this
+   | ---------------------------------------------------------------------------------- method `build` not found for this struct
 ...
 59 |         .build()
    |          ^^^^^ method not found in `OrchestraBuilder<Missing<_>, Init<AwesomeSubSys>, Init<f64>>`
    |
    = note: the method was found for
            - `OrchestraBuilder<Init<S>, Init<AwesomeSubSys>, Init<f64>>`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following traits define an item `build`, perhaps you need to implement one of them:
-           candidate #1: `frame_support::traits::hooks::GenesisBuild`
-           candidate #2: `prometheus::vec::MetricVecBuilder`
diff --git a/node/orchestra/tests/ui/err-08-duplicate-subsystem.stderr b/node/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
@@ -2,7 +2,7 @@ error[E0599]: no method named `sub0` found for struct `OrchestraBuilder<Missing<
   --> tests/ui/err-08-duplicate-subsystem.rs:57:4
    |
 22 | #[orchestra(signal=SigSigSig, error=OrchestraError, event=Event, gen=AllMessages)]
-   | -------------------------------------------------------------------------------- method `sub0` not found for this
+   | ---------------------------------------------------------------------------------- method `sub0` not found for this struct
 ...
 57 |         .sub0(AwesomeSubSys::default()) // Duplicate subsystem
    |          ^^^^-------------------------- help: remove the arguments

diff --git a/node/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr b/node/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
@@ -2,14 +2,10 @@ error[E0599]: no method named `build` found for struct `OrchestraBuilder<Init<Du
   --> tests/ui/err-09-uninit_generic_baggage.rs:59:4
    |
 22 | #[orchestra(signal=SigSigSig, error=OrchestraError, event=Event, gen=AllMessages)]
-   | -------------------------------------------------------------------------------- method `build` not found for this
+   | ---------------------------------------------------------------------------------- method `build` not found for this struct
 ...
 59 |         .build()
    |          ^^^^^ method not found in `OrchestraBuilder<Init<DummySpawner>, Init<AwesomeSubSys>, Missing<_>>`
    |
    = note: the method was found for
            - `OrchestraBuilder<Init<S>, Init<AwesomeSubSys>, Init<T>>`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following traits define an item `build`, perhaps you need to implement one of them:
-           candidate #1: `frame_support::traits::hooks::GenesisBuild`
-           candidate #2: `prometheus::vec::MetricVecBuilder`
diff --git a/node/orchestra/tests/ui/ok-01-wip.rs b/node/orchestra/tests/ui/ok-01-wip.rs
@@ -5,7 +5,6 @@ use orchestra::*;
 #[derive(Default)]
 struct AwesomeSubSysA;
 
-
 impl ::orchestra::Subsystem<OrchestraSubsystemContext<MsgA>, OrchestraError> for AwesomeSubSysA {
 	fn start(self, _ctx: OrchestraSubsystemContext<MsgA>) -> SpawnedSubsystem<OrchestraError> {
 		SpawnedSubsystem { name: "sub A", future: Box::pin(async move { Ok(()) }) }
@@ -41,7 +40,7 @@ impl Spawner for DummySpawner {
 }
 
 #[derive(Default)]
-struct AwesomeSubSysB;
+pub struct AwesomeSubSysB;
 
 #[derive(Clone, Debug)]
 pub struct SigSigSig;

diff --git a/scripts/update-rust-stable.sh b/scripts/update-rust-stable.sh
@@ -36,4 +36,4 @@ export TRYBUILD=overwrite
 # Run all the relevant UI tests
 #
 # Any new UI tests in different crates need to be added here as well.
-rustup run $RUST_VERSION cargo test -p polkadot-overseer-gen ui
+rustup run $RUST_VERSION cargo test -p orchestra ui