language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #7132

Browse source 
7132: Stop using beta toolchain in xtask dist r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2021-01-02 07:52:30 +00:00 • committed by GitHub
commit aa3ce16f26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
xtask/src/dist.rs
View file

@ -63,8 +63,7 @@ fn dist_server() -> Result<()> {
env::set_var("CC", "clang"); env::set_var("CC", "clang");
} }
let toolchain = toolchain(&target); cmd!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?;
cmd!("cargo +{toolchain} build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --target {target} --release").run()?;
let suffix = exe_suffix(&target); let suffix = exe_suffix(&target);
let src = 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<()> { fn gzip(src_path: &Path, dest_path: &Path) -> Result<()> {
let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best()); let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best());
let mut input = io::BufReader::new(File::open(src_path)?); let mut input = io::BufReader::new(File::open(src_path)?);