nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-13 10:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant slicing of whole ranges in bootstrap

Browse Source
This commit is contained in:
pierwill 2022-03-11 13:51:48 -06:00
parent af8604fadd
commit df9797b791
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bootstrap/setup.rs
View File

@ -161,9 +161,9 @@ fn rustup_installed() -> bool {
} }
fn stage_dir_exists(stage_path: &str) -> bool { fn stage_dir_exists(stage_path: &str) -> bool {
match fs::create_dir(&stage_path[..]) { match fs::create_dir(&stage_path) {
Ok(_) => true, Ok(_) => true,
Err(_) => Path::new(&stage_path[..]).exists(), Err(_) => Path::new(&stage_path).exists(),
} }
} }
@ -179,7 +179,7 @@ fn attempt_toolchain_link(stage_path: &str) {
return; return;
} }
if try_link_toolchain(&stage_path[..]) { if try_link_toolchain(&stage_path) {
println!( println!(
"Added `stage1` rustup toolchain; try `cargo +stage1 build` on a separate rust project to run a newly-built toolchain" "Added `stage1` rustup toolchain; try `cargo +stage1 build` on a separate rust project to run a newly-built toolchain"
); );
@ -188,7 +188,7 @@ fn attempt_toolchain_link(stage_path: &str) {
println!( println!(
"To manually link stage 1 build to `stage1` toolchain, run:\n "To manually link stage 1 build to `stage1` toolchain, run:\n
`rustup toolchain link stage1 {}`", `rustup toolchain link stage1 {}`",
&stage_path[..] &stage_path
); );
} }
} }
@ -222,7 +222,7 @@ fn toolchain_is_linked() -> bool {
fn try_link_toolchain(stage_path: &str) -> bool { fn try_link_toolchain(stage_path: &str) -> bool {
Command::new("rustup") Command::new("rustup")
.stdout(std::process::Stdio::null()) .stdout(std::process::Stdio::null())
.args(&["toolchain", "link", "stage1", &stage_path[..]]) .args(&["toolchain", "link", "stage1", &stage_path])
.output() .output()
.map_or(false, |output| output.status.success()) .map_or(false, |output| output.status.success())
} }