Archives/bat
2
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2024-11-04 18:00:24 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/bat/app.rs
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);

7
src/inputfile.rs
View File

@ -66,13 +66,10 @@ impl<'a> OrdinaryFile<'a> {
}
}
pub fn from_path_with_name(
path: &'a OsStr,
user_provided_name: Option<&'a OsStr>,
) -> OrdinaryFile<'a> {
pub fn from_path_with_name(path: &'a OsStr, user_provided_name: &'a OsStr) -> OrdinaryFile<'a> {
OrdinaryFile {
path,
user_provided_name,
user_provided_name: Some(user_provided_name),
}
}