diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-02 07:52:30 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-02 07:52:30 +0000 |
commit | aa3ce16f2641b7eb562a8eae67738b0ff0c0b7b0 (patch) | |
tree | 65fe20a2e00f3ce8b86849b66ee3627da963f9ff | |
parent | b4a7caedb066a653560dfe9ec005f20b9e2548c0 (diff) | |
parent | 08e609bef0636e74ae9cfed4a0966e2a63ce6370 (diff) |
Merge #7132
7132: Stop using beta toolchain in xtask dist r=lnicola a=lnicola
bors r+
Co-authored-by: Laurențiu Nicola <[email protected]>
-rw-r--r-- | xtask/src/dist.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index d59b88131..6bc34106b 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs | |||
@@ -63,8 +63,7 @@ fn dist_server() -> Result<()> { | |||
63 | env::set_var("CC", "clang"); | 63 | env::set_var("CC", "clang"); |
64 | } | 64 | } |
65 | 65 | ||
66 | let toolchain = toolchain(&target); | 66 | cmd!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?; |
67 | cmd!("cargo +{toolchain} build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?; | ||
68 | 67 | ||
69 | let suffix = exe_suffix(&target); | 68 | let suffix = exe_suffix(&target); |
70 | let src = | 69 | let src = |
@@ -118,13 +117,6 @@ fn exe_suffix(target: &str) -> String { | |||
118 | } | 117 | } |
119 | } | 118 | } |
120 | 119 | ||
121 | fn toolchain(target: &str) -> String { | ||
122 | match target { | ||
123 | "aarch64-apple-darwin" => "beta".to_string(), | ||
124 | _ => "stable".to_string(), | ||
125 | } | ||
126 | } | ||
127 | |||
128 | fn gzip(src_path: &Path, dest_path: &Path) -> Result<()> { | 120 | fn gzip(src_path: &Path, dest_path: &Path) -> Result<()> { |
129 | let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best()); | 121 | let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best()); |
130 | let mut input = io::BufReader::new(File::open(src_path)?); | 122 | let mut input = io::BufReader::new(File::open(src_path)?); |