From c1f7ccc7a2b94d54d8add33407ffb82b265d9282 Mon Sep 17 00:00:00 2001
From: Luni-4 <luni-4@hotmail.it>
Date: Fri, 26 Jun 2020 15:51:12 +0200
Subject: [PATCH] Stop installing Rust toolchains, rely on them to be installed
 in the Docker images (#227)

---
 .pre-commit-config.yaml | 2 +-
 .taskcluster.yml        | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed765f371..68315f3b5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
         language: system
         files: '\.rs$'
         exclude: '.*/templates/.*\.rs$'
-        entry: rustup run stable rustfmt --edition 2018
+        entry: cargo fmt -- --check --verbose
 
       - id: clippy
         name: clippy
diff --git a/.taskcluster.yml b/.taskcluster.yml
index dd812bcbf..7ff5e3673 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -40,10 +40,7 @@ tasks:
             - "/bin/bash"
             - "-cx"
             - "curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py &&
-               rustup toolchain install stable &&
-               rustup default stable &&
-               rustup component add clippy &&
-               rustup component add rustfmt &&
+               rustup component add clippy rustfmt &&
                git clone --recursive --quiet ${repository} &&
                cd rust-code-analysis &&
                git -c advice.detachedHead=false checkout ${head_rev} &&
@@ -93,7 +90,7 @@ tasks:
         workerType: ci
         payload:
           maxRunTime: 3600
-          image: "rust:buster"
+          image: "rustlang/rust:nightly"
           env:
             CODECOV_TOKEN: 4df01912-087e-489a-be28-25aa911cb9d2
             CARGO_INCREMENTAL: 0
@@ -104,8 +101,6 @@ tasks:
             - "-cx"
             - "apt-get -qq update &&
                apt-get -qq install -y zip &&
-               rustup toolchain install nightly &&
-               rustup default nightly &&
                curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf - &&
                git clone --recursive --quiet ${repository} &&
                cd rust-code-analysis &&