@@ -9,7 +9,7 @@ use crate::{
9 config::{Config, VisibleLines},
9 config::{Config, VisibleLines},
10 controller::Controller,
10 controller::Controller,
11 error::Result,
11 error::Result,
12− input::Input as BatInput,
12+ input,
13 line_range::{HighlightedLineRanges, LineRange, LineRanges},
13 line_range::{HighlightedLineRanges, LineRange, LineRanges},
14 style::{StyleComponent, StyleComponents},
14 style::{StyleComponent, StyleComponents},
15 SyntaxMapping, WrappingMode,
15 SyntaxMapping, WrappingMode,
@@ -312,18 +312,18 @@ impl<'a> PrettyPrinter<'a> {
313/// An input source for the pretty printer.
313/// An input source for the pretty printer.
314pub struct Input<'a> {
314pub struct Input<'a> {
315− input: BatInput<'a>,
315+ input: input::Input<'a>,
318impl<'a> Input<'a> {
318impl<'a> Input<'a> {
319 /// A new input from a reader.
319 /// A new input from a reader.
320 pub fn from_reader<R: Read + 'a>(reader: R) -> Self {
320 pub fn from_reader<R: Read + 'a>(reader: R) -> Self {
321− BatInput::from_reader(Box::new(reader)).into()
321+ input::Input::from_reader(Box::new(reader)).into()
324 /// A new input from a file.
324 /// A new input from a file.
325 pub fn from_file(path: impl AsRef<OsStr>) -> Self {
325 pub fn from_file(path: impl AsRef<OsStr>) -> Self {
326− BatInput::ordinary_file(path.as_ref()).into()
326+ input::Input::ordinary_file(path.as_ref()).into()
329 /// A new input from bytes.
329 /// A new input from bytes.
@@ -333,7 +333,7 @@ impl<'a> Input<'a> {
334 /// A new input from STDIN.
334 /// A new input from STDIN.
335 pub fn from_stdin() -> Self {
335 pub fn from_stdin() -> Self {
336− BatInput::stdin().into()
336+ input::Input::stdin().into()
339 /// The filename of the input.
339 /// The filename of the input.
@@ -360,14 +360,14 @@ impl<'a> Input<'a> {
363−impl<'a> Into<Input<'a>> for BatInput<'a> {
363+impl<'a> Into<Input<'a>> for input::Input<'a> {
364 fn into(self) -> Input<'a> {
364 fn into(self) -> Input<'a> {
365 Input { input: self }
365 Input { input: self }
369−impl<'a> Into<BatInput<'a>> for Input<'a> {
369+impl<'a> Into<input::Input<'a>> for Input<'a> {
370− fn into(self) -> BatInput<'a> {
370+ fn into(self) -> input::Input<'a> {
371 self.input
371 self.input