Fix merge conflicts

This commit is contained in:
David Peter authored and David Peter committed 2023-03-15 09:33:49 +01:00
1 parent ba30c9db4a
commit 42e85f240c
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -388,7 +388,7 @@ impl Options {
.map_err(|e| OptionsError::FloatParsingError("min-benchmarking-time", e))?;
}
options.command_input_policy = if let Some(path_str) = matches.value_of("input") {
options.command_input_policy = if let Some(path_str) = matches.get_one::<String>("input") {
let path = PathBuf::from(path_str);
if !path.exists() {
return Err(OptionsError::StdinDataFileDoesNotExist(