MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-21 12:28:30 +00:00
Code Issues Releases Wiki Activity

use io::Empty instead of crafted dummy stdin struct

Browse Source
This commit is contained in:
rhysd 2021-10-12 19:21:31 +09:00 committed by David Peter
parent deb80af449
commit f28d9db3d0
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/controller.rs
View File

@ -1,4 +1,4 @@
use std::io::{self, BufRead, Read, Write}; use std::io::{self, BufRead, Write};
use crate::assets::HighlightingAssets; use crate::assets::HighlightingAssets;
use crate::config::{Config, VisibleLines}; use crate::config::{Config, VisibleLines};
@ -16,19 +16,6 @@ use crate::printer::{InteractivePrinter, Printer, SimplePrinter};
use clircle::{Clircle, Identifier}; use clircle::{Clircle, Identifier};
struct DummyStdin;
impl Read for DummyStdin {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
Ok(buf.len())
}
}
impl BufRead for DummyStdin {
fn fill_buf(&mut self) -> io::Result<&[u8]> {
Ok(&[])
}
fn consume(&mut self, _amt: usize) {}
}
pub struct Controller<'a> { pub struct Controller<'a> {
config: &'a Config<'a>, config: &'a Config<'a>,
assets: &'a HighlightingAssets, assets: &'a HighlightingAssets,
@ -98,7 +85,7 @@ impl<'b> Controller<'b> {
self.print_input(input, writer, io::stdin().lock(), identifier, is_first) self.print_input(input, writer, io::stdin().lock(), identifier, is_first)
} else { } else {
// Use dummy stdin since stdin is actually not used (#1902) // Use dummy stdin since stdin is actually not used (#1902)
self.print_input(input, writer, DummyStdin, identifier, is_first) self.print_input(input, writer, io::empty(), identifier, is_first)
}; };
if let Err(error) = result { if let Err(error) = result {
if attached_to_pager { if attached_to_pager {