MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2024-10-06 10:51:05 +01:00
Code Issues Releases Wiki Activity

Change use of 'BatInput' to 'input::Input'

Browse Source
This commit is contained in:
Ethan P 2020-05-27 16:32:15 -07:00 committed by David Peter
parent d2b26a5f1f
commit 342cae2dc6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretty_printer.rs
View File

@ -9,7 +9,7 @@ use crate::{
config::{Config, VisibleLines}, config::{Config, VisibleLines},
controller::Controller, controller::Controller,
error::Result, error::Result,
input::Input as BatInput, input,
line_range::{HighlightedLineRanges, LineRange, LineRanges}, line_range::{HighlightedLineRanges, LineRange, LineRanges},
style::{StyleComponent, StyleComponents}, style::{StyleComponent, StyleComponents},
SyntaxMapping, WrappingMode, SyntaxMapping, WrappingMode,
@ -312,18 +312,18 @@ impl<'a> PrettyPrinter<'a> {
/// An input source for the pretty printer. /// An input source for the pretty printer.
pub struct Input<'a> { pub struct Input<'a> {
input: BatInput<'a>, input: input::Input<'a>,
} }
impl<'a> Input<'a> { impl<'a> Input<'a> {
/// A new input from a reader. /// A new input from a reader.
pub fn from_reader<R: Read + 'a>(reader: R) -> Self { pub fn from_reader<R: Read + 'a>(reader: R) -> Self {
BatInput::from_reader(Box::new(reader)).into() input::Input::from_reader(Box::new(reader)).into()
} }
/// A new input from a file. /// A new input from a file.
pub fn from_file(path: impl AsRef<OsStr>) -> Self { pub fn from_file(path: impl AsRef<OsStr>) -> Self {
BatInput::ordinary_file(path.as_ref()).into() input::Input::ordinary_file(path.as_ref()).into()
} }
/// A new input from bytes. /// A new input from bytes.
@ -333,7 +333,7 @@ impl<'a> Input<'a> {
/// A new input from STDIN. /// A new input from STDIN.
pub fn from_stdin() -> Self { pub fn from_stdin() -> Self {
BatInput::stdin().into() input::Input::stdin().into()
} }
/// The filename of the input. /// The filename of the input.
@ -360,14 +360,14 @@ impl<'a> Input<'a> {
} }
} }
impl<'a> Into<Input<'a>> for BatInput<'a> { impl<'a> Into<Input<'a>> for input::Input<'a> {
fn into(self) -> Input<'a> { fn into(self) -> Input<'a> {
Input { input: self } Input { input: self }
} }
} }
impl<'a> Into<BatInput<'a>> for Input<'a> { impl<'a> Into<input::Input<'a>> for Input<'a> {
fn into(self) -> BatInput<'a> { fn into(self) -> input::Input<'a> {
self.input self.input
} }
} }