diff options
| author | Ralf Jung <post@ralfj.de> | 2025-09-20 09:34:51 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2025-09-20 09:34:51 +0200 |
| commit | f3427c50c20ff78f1c088f81d069e53be57d5b0a (patch) | |
| tree | 4298c340d23a92c9d4d6d1f6b24f562165533f4d | |
| parent | 340c6e76ec16aae2110596b8b3fa7f05fee7858e (diff) | |
| download | rust-f3427c50c20ff78f1c088f81d069e53be57d5b0a.tar.gz rust-f3427c50c20ff78f1c088f81d069e53be57d5b0a.zip | |
clippy
| -rw-r--r-- | src/tools/miri/miri-script/src/commands.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs index ee09b9b4b73..f1b52293123 100644 --- a/src/tools/miri/miri-script/src/commands.rs +++ b/src/tools/miri/miri-script/src/commands.rs @@ -130,15 +130,15 @@ impl Command { let new_commit = sh.read_file("rust-version")?.trim().to_owned(); let current_commit = { let rustc_info = cmd!(sh, "rustc +miri --version -v").read(); - if rustc_info.is_err() { - None - } else { - let metadata = rustc_version::version_meta_for(&rustc_info.unwrap())?; + if let Ok(rustc_info) = rustc_info { + let metadata = rustc_version::version_meta_for(&rustc_info)?; Some( metadata .commit_hash .ok_or_else(|| anyhow!("rustc metadata did not contain commit hash"))?, ) + } else { + None } }; // Check if we already are at that commit. |
