From 599dc823c9d7049e8ee9eb80203a24cac41cb124 Mon Sep 17 00:00:00 2001 From: Jakub Beránek Date: Sun, 16 Mar 2025 13:23:41 +0100 Subject: Simplify `get_git_modified_files` It only ever returned `Some`, so `Option` was useless in its return type. --- src/tools/compiletest/src/lib.rs | 3 +-- src/tools/suggest-tests/src/main.rs | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/tools') 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, 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; -- cgit 1.4.1-3-g733a5