MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-11-04 00:51:56 +00:00
Code Issues Releases Wiki Activity

replace trait object BufRead by generic

Browse Source
This commit is contained in:
TA Thanh Dinh
2018-08-17 17:48:15 +02:00
committed by David Peter
parent 94ccc646e8
commit 037861e588
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/features.rs
View File

@@ -86,25 +86,26 @@ fn print_file(
printer: &mut Printer,
filename: Option<&str>,
) -> Result<()> {
let stdin = io::stdin(); // TODO: this is not always needed
{
let reader: Box<BufRead> = match filename {
None => Box::new(stdin.lock()),
Some(filename) => Box::new(BufReader::new(File::open(filename)?)),
};
printer.print_header(filename)?;
let highlighter = HighlightLines::new(syntax, theme);
printer.print_header(filename)?;
print_file_ranges(printer, reader, highlighter, &printer.config.line_range)?;
printer.print_footer()?;
let highlighter = HighlightLines::new(syntax, theme);
match filename {
None => {
let stdin = io::stdin(); // TODO: this is not always needed
print_file_ranges(printer, stdin.lock(), highlighter, &printer.config.line_range)?;
},
Some(filename) => {
print_file_ranges(printer, BufReader::new(File::open(filename)?), highlighter, &printer.config.line_range)?
},
}
printer.print_footer()?;
Ok(())
}
fn print_file_ranges<'a>(
fn print_file_ranges<T: BufRead>(
printer: &mut Printer,
mut reader: Box<BufRead + 'a>,
mut reader: T,
mut highlighter: HighlightLines,
line_ranges: &Option<LineRange>,
) -> Result<()> {