git.iko.soy/bat
on master help sign in
Simplify public API module structure
commitbb0a3d586ef00dfa1fc77b665c0ae5735a05b5b9 authorsharkdp <davidpeter@web.de> dateSat 21 Mar 2020, 21:03 (7 years ago) parent90397a8
5 files changed+16−22
compare with master
unifiedsplit
examples/simple.rs+1−3 src/bin/bat/app.rs+4−6 src/bin/bat/main.rs+1−3 src/config.rs+5−5 src/lib.rs+5−5
examples/simple.rs+1−3
@@ -1,9 +1,7 @@
11use bat::{
22 assets::HighlightingAssets,
3− config::Config,
3+ config::{Config, InputFile, StyleComponent, StyleComponents},
44 controller::Controller,
5− inputfile::InputFile,
6− style::{StyleComponent, StyleComponents},
75};
86use console::Term;
97use std::process;
src/bin/bat/app.rs+4−6
@@ -18,13 +18,11 @@ use ansi_term;
1818
1919use bat::{
2020 assets::HighlightingAssets,
21− config::{Config, PagingMode},
21+ config::{
22+ Config, HighlightedLineRanges, InputFile, LineRange, LineRanges, OutputWrap, PagingMode,
23+ StyleComponent, StyleComponents, SyntaxMapping,
24+ },
2225 errors::*,
23− inputfile::InputFile,
24− line_range::{HighlightedLineRanges, LineRange, LineRanges},
25− style::{StyleComponent, StyleComponents},
26− syntax_mapping::SyntaxMapping,
27− wrap::OutputWrap,
2826};
2927
3028fn is_truecolor_terminal() -> bool {
src/bin/bat/main.rs+1−3
@@ -29,10 +29,8 @@ use directories::PROJECT_DIRS;
2929
3030use bat::{
3131 assets::HighlightingAssets,
32− config::Config,
32+ config::{Config, InputFile, StyleComponent, StyleComponents},
3333 errors::*,
34− inputfile::InputFile,
35− style::{StyleComponent, StyleComponents},
3634};
3735
3836fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
src/config.rs+5−5
@@ -1,8 +1,8 @@
1−use crate::inputfile::InputFile;
2−use crate::line_range::{HighlightedLineRanges, LineRanges};
3−use crate::style::StyleComponents;
4−use crate::syntax_mapping::SyntaxMapping;
5−use crate::wrap::OutputWrap;
1+pub use crate::inputfile::InputFile;
2+pub use crate::line_range::{HighlightedLineRanges, LineRange, LineRanges};
3+pub use crate::style::{StyleComponent, StyleComponents};
4+pub use crate::syntax_mapping::SyntaxMapping;
5+pub use crate::wrap::OutputWrap;
66
77#[derive(Debug, Clone, Copy, PartialEq)]
88pub enum PagingMode {
src/lib.rs+5−5
@@ -18,13 +18,13 @@ pub mod controller;
1818mod decorations;
1919mod diff;
2020pub mod errors;
21−pub mod inputfile;
21+pub(crate) mod inputfile;
2222mod less;
23−pub mod line_range;
23+pub(crate) mod line_range;
2424mod output;
2525mod preprocessor;
2626mod printer;
27−pub mod style;
28−pub mod syntax_mapping;
27+pub(crate) mod style;
28+pub(crate) mod syntax_mapping;
2929mod terminal;
30−pub mod wrap;
30+pub(crate) mod wrap;