From 08e609bef0636e74ae9cfed4a0966e2a63ce6370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
Date: Sat, 2 Jan 2021 09:51:41 +0200
Subject: [PATCH] Stop using beta toolchain in xtask dist
---
xtask/src/dist.rs | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
index d59b88131a2..6bc34106b66 100644
--- a/xtask/src/dist.rs
+++ b/xtask/src/dist.rs
@@ -63,8 +63,7 @@ fn dist_server() -> Result<()> {
env::set_var("CC", "clang");
}
- let toolchain = toolchain(&target);
- cmd!("cargo +{toolchain} build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?;
+ cmd!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?;
let suffix = exe_suffix(&target);
let src =
@@ -118,13 +117,6 @@ fn exe_suffix(target: &str) -> String {
}
}
-fn toolchain(target: &str) -> String {
- match target {
- "aarch64-apple-darwin" => "beta".to_string(),
- _ => "stable".to_string(),
- }
-}
-
fn gzip(src_path: &Path, dest_path: &Path) -> Result<()> {
let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best());
let mut input = io::BufReader::new(File::open(src_path)?);