on master help sign in
use io::Empty instead of crafted dummy stdin struct
commitf28d9db3d0903dfa6ecbaf9fae6e3e4605c6f33d authorrhysd <lin90162@yahoo.co.jp> dateTue 12 Oct 2021, 19:21 (5 years ago) parentdeb80af
1 file changed+2−15
src/controller.rs+2−15
src/controller.rs+2−15
@@ -1,4 +1,4 @@
1−use std::io::{self, BufRead, Read, Write};
1+use std::io::{self, BufRead, Write};
22
33use crate::assets::HighlightingAssets;
44use crate::config::{Config, VisibleLines};
@@ -16,19 +16,6 @@ use crate::printer::{InteractivePrinter, Printer, SimplePrinter};
1616
1717use clircle::{Clircle, Identifier};
1818
19−struct DummyStdin;
20−impl Read for DummyStdin {
21− fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
22− Ok(buf.len())
23− }
24−}
25−impl BufRead for DummyStdin {
26− fn fill_buf(&mut self) -> io::Result<&[u8]> {
27− Ok(&[])
28− }
29− fn consume(&mut self, _amt: usize) {}
30−}
31−
3219pub struct Controller<'a> {
3320 config: &'a Config<'a>,
3421 assets: &'a HighlightingAssets,
@@ -98,7 +85,7 @@ impl<'b> Controller<'b> {
9885 self.print_input(input, writer, io::stdin().lock(), identifier, is_first)
9986 } else {
10087 // Use dummy stdin since stdin is actually not used (#1902)
101− self.print_input(input, writer, DummyStdin, identifier, is_first)
88+ self.print_input(input, writer, io::empty(), identifier, is_first)
10289 };
10390 if let Err(error) = result {
10491 if attached_to_pager {