extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-08-10 08:08:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move read_line functionality to inputfile module

Browse Source
This commit is contained in:
sharkdp
2018-10-07 12:15:49 +02:00
committed by David Peter
parent 87f021078e
commit 6d1cc8c2c8
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controller.rs
View File

@ -1,9 +1,9 @@
use std::io::{self, BufRead, Write};
use std::io::{self, Write};
use app::Config;
use assets::HighlightingAssets;
use errors::*;
use inputfile::InputFile;
use inputfile::{InputFile, InputFileReader};
use line_range::LineRange;
use output::OutputType;
use printer::{InteractivePrinter, Printer, SimplePrinter};
@ -61,14 +61,14 @@ impl<'b> Controller<'b> {
&self,
printer: &mut P,
writer: &mut Write,
mut reader: Box<BufRead + 'a>,
mut reader: InputFileReader,
line_ranges: &Option<LineRange>,
) -> Result<()> {
let mut line_buffer = Vec::new();
let mut line_number: usize = 1;
while reader.read_until(b'\n', &mut line_buffer)? > 0 {
while reader.read_line(&mut line_buffer)? {
match line_ranges {
&Some(ref range) => {
if line_number < range.lower {