Use the new component dependency option of the rust-toolchain file

Author: bjorn3

.github/workflows/bootstrap_rustc.yml

@@ -34,6 +34,7 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "User"
+        rustup self update
         ./prepare.sh
 
     - name: Test

.github/workflows/main.yml

@@ -40,6 +40,7 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "User"
+        rustup self update
         ./prepare.sh
 
     - name: Test

prepare.sh

@@ -1,7 +1,6 @@
 #!/bin/bash --verbose
 set -e
 
-rustup component add rust-src rustc-dev llvm-tools-preview
 ./build_sysroot/prepare_sysroot_src.sh
 cargo install hyperfine || echo "Skipping hyperfine install"
 

rust-toolchain

@@ -1 +1,3 @@
-nightly-2020-11-21
+[toolchain]
+channel = "nightly-2020-11-21"
+components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

scripts/cargo.sh

@@ -4,7 +4,7 @@ dir=$(dirname "$0")
 source "$dir/config.sh"
 
 # read nightly compiler from rust-toolchain file
-TOOLCHAIN=$(cat "$dir/rust-toolchain")
+TOOLCHAIN=$(cat "$dir/rust-toolchain" | grep channel | sed "s/channel = \"\(.*\)\"/\1/")
 
 cmd=$1
 shift || true

scripts/rustup.sh

@@ -8,7 +8,7 @@ case $1 in
 
         echo "=> Installing new nightly"
         rustup toolchain install --profile minimal "nightly-${TOOLCHAIN}" # Sanity check to see if the nightly exists
-        echo "nightly-${TOOLCHAIN}" > rust-toolchain
+        sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain
         rustup component add rustfmt || true
 
         echo "=> Uninstalling all old nighlies"