frank/sharkdp--bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2026-08-05 19:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not take optional as argument

Browse Source
This commit is contained in:
sharkdp
2020-04-11 19:23:32 +02:00
committed by David Peter
parent 90e7d2fe33
commit 2ad1848859
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/bat/app.rs
+8 -10
View File
@@ -260,17 +260,15 @@ impl App {
let mut file_input = Vec::new();
for (input, name) in files_or_none.zip(filenames_or_none) {
match input {
Some(input) => {
if input.to_str().unwrap() == "-" {
file_input.push(InputFile::StdIn(name));
} else {
file_input.push(InputFile::Ordinary(OrdinaryFile::from_path_with_name(
input, name,
)))
}
if let Some(input) = input {
if input.to_str().unwrap() == "-" {
file_input.push(InputFile::StdIn(name));
} else {
let ofile = name.map_or(OrdinaryFile::from_path(input), |n| {
OrdinaryFile::from_path_with_name(input, n)
});
file_input.push(InputFile::Ordinary(ofile))
}
None => {}
}
}
return Ok(file_input);