8961f7a · bat · git.iko.soy

git.iko.soy/bat

Move PagingMode to separate module

commit8961f7aef8a24e35007b6e6d4eed5bdaa30763a9 authorsharkdp <davidpeter@web.de> dateWed 22 Apr 2020, 22:54 (7 years ago) parent17f3a3b

7 files changed+24−22

compare with master

unifiedsplit

src/bin/bat/app.rs+2−1 src/config.rs+2−15 src/controller.rs+2−2 src/lib.rs+3−1 src/output.rs+2−2 src/paging.rs+12 src/pretty_printer.rs+1−1

src/bin/bat/app.rs+2−1

@@ -15,10 +15,11 @@ use console::Term;

1515

1616use bat::{

1717 assets::HighlightingAssets,

18− config::{Config, PagingMode},

18+ config::Config,

1919 error::*,

2020 input::Input,

2121 line_range::{HighlightedLineRanges, LineRange, LineRanges},

22+ paging::PagingMode,

2223 style::{StyleComponent, StyleComponents},

2324 MappingTarget, SyntaxMapping, WrappingMode,

2425};

src/config.rs+2−15

@@ -1,23 +1,10 @@

11use crate::line_range::{HighlightedLineRanges, LineRanges};

2+#[cfg(feature = "paging")]

3+use crate::paging::PagingMode;

24use crate::style::StyleComponents;

35use crate::syntax_mapping::SyntaxMapping;

46use crate::wrapping::WrappingMode;

6−#[derive(Debug, Clone, Copy, PartialEq)]

7−#[cfg(feature = "paging")]

8−pub enum PagingMode {

9− Always,

10− QuitIfOneScreen,

11− Never,

12−}

13−

14−#[cfg(feature = "paging")]

15−impl Default for PagingMode {

16− fn default() -> Self {

17− PagingMode::Never

18− }

19−}

20−

218#[derive(Debug, Clone, Default)]

229pub struct Config<'a> {

2310 /// The explicitly configured language, if any

src/controller.rs+2−2

@@ -2,12 +2,12 @@ use std::io::{self, Write};

33use crate::assets::HighlightingAssets;

44use crate::config::Config;

5−#[cfg(feature = "paging")]

6−use crate::config::PagingMode;

75use crate::error::*;

86use crate::input::{Input, InputReader, OpenedInput};

97use crate::line_range::{LineRanges, RangeCheckResult};

108use crate::output::OutputType;

9+#[cfg(feature = "paging")]

10+use crate::paging::PagingMode;

1111use crate::printer::{InteractivePrinter, Printer, SimplePrinter};

1212

1313pub struct Controller<'a> {

src/lib.rs+3−1

@@ -29,6 +29,8 @@ pub mod input;

2929mod less;

3030pub mod line_range;

3131mod output;

32+#[cfg(feature = "paging")]

33+pub mod paging;

3234mod preprocessor;

3335mod pretty_printer;

3436pub(crate) mod printer;

@@ -42,4 +44,4 @@ pub use syntax_mapping::{MappingTarget, SyntaxMapping};

4244pub use wrapping::WrappingMode;

4345

4446#[cfg(feature = "paging")]

45−pub use config::PagingMode;

47+pub use paging::PagingMode;

src/output.rs+2−2

@@ -2,11 +2,11 @@ use std::io::{self, Write};

22#[cfg(feature = "paging")]

33use std::process::Child;

5−#[cfg(feature = "paging")]

6−use crate::config::PagingMode;

75use crate::error::*;

86#[cfg(feature = "paging")]

97use crate::less::retrieve_less_version;

8+#[cfg(feature = "paging")]

9+use crate::paging::PagingMode;

1010

1111#[derive(Debug)]

1212pub enum OutputType {

src/paging.rsnew file+12

@@ -0,0 +1,12 @@

1+#[derive(Debug, Clone, Copy, PartialEq)]

2+pub enum PagingMode {

3+ Always,

4+ QuitIfOneScreen,

5+ Never,

6+}

8+impl Default for PagingMode {

9+ fn default() -> Self {

10+ PagingMode::Never

11+ }

12+}

src/pretty_printer.rs+1−1

@@ -16,7 +16,7 @@ use crate::{

1616};

1717

1818#[cfg(feature = "paging")]

19−use crate::config::PagingMode;

19+use crate::paging::PagingMode;

2020

2121#[derive(Default)]

2222struct ActiveStyleComponents {