Skip to content

Commit aa3ce16

Browse files
bors[bot]lnicola
andauthored
Merge #7132
7132: Stop using beta toolchain in xtask dist r=lnicola a=lnicola bors r+ Co-authored-by: Laurențiu Nicola <[email protected]>
2 parents b4a7cae + 08e609b commit aa3ce16

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

xtask/src/dist.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ fn dist_server() -> Result<()> {
6363
env::set_var("CC", "clang");
6464
}
6565

66-
let toolchain = toolchain(&target);
67-
cmd!("cargo +{toolchain} build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?;
66+
cmd!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?;
6867

6968
let suffix = exe_suffix(&target);
7069
let src =
@@ -118,13 +117,6 @@ fn exe_suffix(target: &str) -> String {
118117
}
119118
}
120119

121-
fn toolchain(target: &str) -> String {
122-
match target {
123-
"aarch64-apple-darwin" => "beta".to_string(),
124-
_ => "stable".to_string(),
125-
}
126-
}
127-
128120
fn gzip(src_path: &Path, dest_path: &Path) -> Result<()> {
129121
let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best());
130122
let mut input = io::BufReader::new(File::open(src_path)?);

0 commit comments

Comments
 (0)