diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-03-21 15:48:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-21 15:48:56 +0100 |
| commit | ed3a39da7f5bf49a7910b3cbf3a0cf92ff8ef0ac (patch) | |
| tree | faf70510634ec74cfa8a4e64cda2577e47e6709d /src/tools | |
| parent | 015df66ee29844e4e46096c0fcb94079f28d4c30 (diff) | |
| parent | b24dc75ee46c702404d6137e402f967876b0b68d (diff) | |
| download | rust-ed3a39da7f5bf49a7910b3cbf3a0cf92ff8ef0ac.tar.gz rust-ed3a39da7f5bf49a7910b3cbf3a0cf92ff8ef0ac.zip | |
Rollup merge of #138706 - Kobzol:bootstrap-git-refactor-1, r=onur-ozkan
Improve bootstrap git modified path handling Drive-by improvements extracted out of https://github.com/rust-lang/rust/pull/138591. r? ``@onur-ozkan``
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/lib.rs | 3 | ||||
| -rw-r--r-- | src/tools/suggest-tests/src/main.rs | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/tools/compiletest/src/lib.rs b/src/tools/compiletest/src/lib.rs index dd611b19a8d..3ec984edacb 100644 --- a/src/tools/compiletest/src/lib.rs +++ b/src/tools/compiletest/src/lib.rs @@ -747,8 +747,7 @@ fn modified_tests(config: &Config, dir: &Path) -> Result<Vec<PathBuf>, String> { } let files = - get_git_modified_files(&config.git_config(), Some(dir), &vec!["rs", "stderr", "fixed"])? - .unwrap_or(vec![]); + get_git_modified_files(&config.git_config(), Some(dir), &vec!["rs", "stderr", "fixed"])?; // Add new test cases to the list, it will be convenient in daily development. let untracked_files = get_git_untracked_files(&config.git_config(), None)?.unwrap_or(vec![]); diff --git a/src/tools/suggest-tests/src/main.rs b/src/tools/suggest-tests/src/main.rs index ee8cc40404d..ee212af3626 100644 --- a/src/tools/suggest-tests/src/main.rs +++ b/src/tools/suggest-tests/src/main.rs @@ -14,11 +14,7 @@ fn main() -> ExitCode { &Vec::new(), ); let modified_files = match modified_files { - Ok(Some(files)) => files, - Ok(None) => { - eprintln!("git error"); - return ExitCode::FAILURE; - } + Ok(files) => files, Err(err) => { eprintln!("Could not get modified files from git: \"{err}\""); return ExitCode::FAILURE; |
