aboutsummaryrefslogtreecommitdiff
path: root/xtask/src/lib.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-08 16:36:11 +0000
committerGitHub <[email protected]>2019-12-08 16:36:11 +0000
commitd27b03388326c91c7fb242e64bcc6037bb9140fe (patch)
treea6f38d2596d2d396a34648cac305f606e4905139 /xtask/src/lib.rs
parent596e6db46c9c79b2b2be20a4b5461dca35d44b0f (diff)
parent74c7c7a8b1faa0da6a0880916a5e2e5c2b9c1d3f (diff)
Merge #2504
2504: Use rustup toolchain install instead of rustup install r=matklad a=edwin0cheng `rustup install` and `rustup uninstall` are going to be deprecated in rustup 1.21.0 See https://github.com/rust-lang/rustup/issues/2148 and https://www.reddit.com/r/rust/comments/e7rer9/we_need_your_help_before_rustup_1210_can_be/ Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'xtask/src/lib.rs')
-rw-r--r--xtask/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 7332a4072..190baeddf 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -79,7 +79,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
79} 79}
80 80
81pub fn install_rustfmt() -> Result<()> { 81pub fn install_rustfmt() -> Result<()> {
82 run(&format!("rustup install {}", TOOLCHAIN), ".")?; 82 run(&format!("rustup toolchain install {}", TOOLCHAIN), ".")?;
83 run(&format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN), ".") 83 run(&format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN), ".")
84} 84}
85 85
@@ -125,7 +125,7 @@ pub fn run_clippy() -> Result<()> {
125} 125}
126 126
127pub fn install_clippy() -> Result<()> { 127pub fn install_clippy() -> Result<()> {
128 run(&format!("rustup install {}", TOOLCHAIN), ".")?; 128 run(&format!("rustup toolchain install {}", TOOLCHAIN), ".")?;
129 run(&format!("rustup component add clippy --toolchain {}", TOOLCHAIN), ".") 129 run(&format!("rustup component add clippy --toolchain {}", TOOLCHAIN), ".")
130} 130}
131 131