Attempt to resolve the problem

Author: asomers

.cirrus.yml

@@ -7,6 +7,7 @@ env:
   BUILD: build
   RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
+  PLUSTOOLCHAIN: +$TOOLCHAIN
   TOOL: cargo
   # The MSRV
   TOOLCHAIN: 1.63.0
@@ -16,21 +17,21 @@ env:
 build: &BUILD
   build_script:
     - . $HOME/.cargo/env || true
-    - $TOOL +$TOOLCHAIN -Vv
-    - rustc +$TOOLCHAIN -Vv
-    - $TOOL +$TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
-    - $TOOL +$TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
-    - $TOOL +$TOOLCHAIN clippy $ZFLAGS --target $TARGET --all-targets -- -D warnings
+    - $TOOL $PLUSTOOLCHAIN -Vv
+    - rustc $PLUSTOOLCHAIN -Vv
+    - $TOOL $PLUSTOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
+    - $TOOL $PLUSTOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
+    - $TOOL $PLUSTOOLCHAIN clippy $ZFLAGS --target $TARGET --all-targets -- -D warnings
     - if [ -z "$NOHACK" ]; then mkdir -p $HOME/.cargo/bin; export PATH=$HOME/.cargo/bin:$PATH; fi
     - if [ -z "$NOHACK" ]; then curl -LsSf https://github.com/taiki-e/cargo-hack/releases/latest/download/cargo-hack-${HOST:-$TARGET}.tar.gz | tar xzf - -C ~/.cargo/bin; fi
-    - if [ -z "$NOHACK" ]; then $TOOL +$TOOLCHAIN hack $ZFLAGS check --target $TARGET --each-feature; fi
+    - if [ -z "$NOHACK" ]; then $TOOL $PLUSTOOLCHAIN hack $ZFLAGS check --target $TARGET --each-feature; fi
 
 # Tests that do require executing the binaries
 test: &TEST
   << : *BUILD
   test_script:
     - . $HOME/.cargo/env || true
-    - $TOOL +$TOOLCHAIN test --target $TARGET
+    - $TOOL $PLUSTOOLCHAIN test --target $TARGET
 
 # Test FreeBSD in a full VM.  Test the i686 target too, in the
 # same VM.  The binary will be built in 32-bit mode, but will execute on a
@@ -165,9 +166,9 @@ task:
     image: rust:latest
   env:
     TARGET: x86_64-unknown-linux-gnu
-    TOOLCHAIN: stable
+    TOOLCHAIN:
+    PLUSTOOLCHAIN:
   setup_script:
-    - rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET
     - rustup component add clippy
     - rustup toolchain list
     - rustc --version
@@ -294,26 +295,26 @@ task:
   #<< : *BUILD
   #before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-## Test that we can build with the lowest version of all dependencies.
-## "cargo test" doesn't work because some of our dev-dependencies, like
-## rand, can't build with their own minimal dependencies.
-#task:
-  #name: Minver
-  #env:
-    #HOST: x86_64-unknown-linux-gnu
-    #TOOLCHAIN: nightly
-  #container:
-    #image: rustlang/rust:nightly
-  #setup_script:
-    #- cargo update -Zminimal-versions
-  #check_script:
-    #- cargo check
-  #before_cache_script: rm -rf $CARGO_HOME/registry/index
+# Test that we can build with the lowest version of all dependencies.
+# "cargo test" doesn't work because some of our dev-dependencies, like
+# rand, can't build with their own minimal dependencies.
+task:
+  name: Minver
+  env:
+    HOST: x86_64-unknown-linux-gnu
+    TOOLCHAIN: nightly
+  container:
+    image: rustlang/rust:nightly
+  setup_script:
+    - cargo update -Zminimal-versions
+  check_script:
+    - cargo check
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 ## Tasks that checks if the code is formatted right using `cargo fmt` tool
 #task:
   #name: Rust Formatter
   #container:
     #image: rust:latest
-  #setup_script: rustup +$TOOLCHAIN component add rustfmt
-  #test_script: $TOOL +$TOOLCHAIN fmt --all -- --check **/*.rs
+  #setup_script: rustup $PLUSTOOLCHAIN component add rustfmt
+  #test_script: $TOOL $PLUSTOOLCHAIN fmt --all -- --check **/*.rs