frank/sharkdp--bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2026-07-25 17:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Input.as_file and add Input::stdin_as_file

Browse Source
This commit is contained in:
Ethan P
2020-05-27 15:40:57 -07:00
committed by David Peter
parent c4d0d068e4
commit 7a9decad70
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/bat/app.rs
+3 -3
View File
@@ -257,7 +257,7 @@ impl App {
let files: Option<Vec<&OsStr>> = self.matches.values_of_os("FILE").map(|vs| vs.collect());
if files.is_none() {
let input = Input::stdin().as_file(filenames_or_none.next().unwrap_or(None));
let input = Input::stdin_as_file(filenames_or_none.next().unwrap_or(None));
return Ok(vec![input]);
}
let files_or_none: Box<dyn Iterator<Item = _>> = match files {
@@ -269,9 +269,9 @@ impl App {
for (filepath, provided_name) in files_or_none.zip(filenames_or_none) {
if let Some(filepath) = filepath {
if filepath.to_str().unwrap_or_default() == "-" {
file_input.push(Input::stdin().as_file(provided_name));
file_input.push(Input::stdin_as_file(provided_name));
} else {
file_input.push(Input::ordinary_file(filepath).as_file(provided_name));
file_input.push(Input::ordinary_file(filepath).with_name(provided_name));
}
}
}