From 7d6a15e63c95e46c2ba68bedd2efa40a72e9cf40 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Mon, 15 Mar 2021 09:35:01 -0600
Subject: [PATCH] Convert toolchain file to TOML syntax

rustup 1.23.0 (2020-11-27) introduced support for TOML syntax for the
toolchain file. Use this and specify required compoenents.

To ensure you are using a new enough rustup, run:

    rustup self update
---
 rust-toolchain  | 4 +++-
 scripts/deps.sh | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index 40973da..3baacd4 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1,3 @@
-nightly-2020-07-27
+[toolchain]
+channel = "nightly-2020-07-27"
+components = ["rust-src"]
diff --git a/scripts/deps.sh b/scripts/deps.sh
index 9654ee8..ea40b70 100755
--- a/scripts/deps.sh
+++ b/scripts/deps.sh
@@ -89,11 +89,8 @@ if ! which rustup &> /dev/null; then
   source "${HOME}/.cargo/env"
 fi
 
-msg "Installing pinned Rust toolchain"
-rustup toolchain install "$(cat rust-toolchain)"
-
-msg "Installing source for pinned Rust toolchain"
-rustup component add --toolchain "$(cat rust-toolchain)" rust-src
+msg "Installing pinned Rust toolchain and components"
+rustup show
 
 msg "\x1B[32mSuccessfully installed dependencies"
 echo "Ready to run ./scripts/build.sh [model]" >&2