nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

miri-script/toolchain: make new_commit logic easier to follow

Browse Source
This commit is contained in:
Ralf Jung 2024-03-24 14:49:46 +01:00
parent fdb561309d
commit acf3f52b7b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/miri/miri-script/src/commands.rs
View File

@ -178,7 +178,7 @@ impl Command {
.context("Please install rustup-toolchain-install-master by running 'cargo install rustup-toolchain-install-master'")?; .context("Please install rustup-toolchain-install-master by running 'cargo install rustup-toolchain-install-master'")?;
let sh = Shell::new()?; let sh = Shell::new()?;
sh.change_dir(miri_dir()?); sh.change_dir(miri_dir()?);
let new_commit = Some(sh.read_file("rust-version")?.trim().to_owned()); let new_commit = sh.read_file("rust-version")?.trim().to_owned();
let current_commit = { let current_commit = {
let rustc_info = cmd!(sh, "rustc +miri --version -v").read(); let rustc_info = cmd!(sh, "rustc +miri --version -v").read();
if rustc_info.is_err() { if rustc_info.is_err() {
@ -193,7 +193,7 @@ impl Command {
} }
}; };
// Check if we already are at that commit. // Check if we already are at that commit.
if current_commit == new_commit { if current_commit.as_ref() == Some(&new_commit) {
if active_toolchain()? != "miri" { if active_toolchain()? != "miri" {
cmd!(sh, "rustup override set miri").run()?; cmd!(sh, "rustup override set miri").run()?;
} }
@ -202,7 +202,7 @@ impl Command {
// Install and setup new toolchain. // Install and setup new toolchain.
cmd!(sh, "rustup toolchain uninstall miri").run()?; cmd!(sh, "rustup toolchain uninstall miri").run()?;
cmd!(sh, "rustup-toolchain-install-master -n miri -c cargo -c rust-src -c rustc-dev -c llvm-tools -c rustfmt -c clippy {flags...} -- {new_commit...}").run()?; cmd!(sh, "rustup-toolchain-install-master -n miri -c cargo -c rust-src -c rustc-dev -c llvm-tools -c rustfmt -c clippy {flags...} -- {new_commit}").run()?;
cmd!(sh, "rustup override set miri").run()?; cmd!(sh, "rustup override set miri").run()?;
// Cleanup. // Cleanup.
cmd!(sh, "cargo clean").run()?; cmd!(sh, "cargo clean").run()?;