diff options
| -rw-r--r-- | examples/simple.rs | 3 | ||||
| -rw-r--r-- | src/bin/bat/app.rs | 2 | ||||
| -rw-r--r-- | src/bin/bat/assets.rs | 2 | ||||
| -rw-r--r-- | src/bin/bat/main.rs | 4 | ||||
| -rw-r--r-- | src/lib.rs | 10 | ||||
| -rw-r--r-- | tests/no_duplicate_extensions.rs | 2 |
6 files changed, 13 insertions, 10 deletions
diff --git a/examples/simple.rs b/examples/simple.rs index 2453ccac..3e582eae 100644 --- a/examples/simple.rs +++ b/examples/simple.rs @@ -1,7 +1,6 @@ use bat::{ - assets::HighlightingAssets, config::{Config, InputFile, StyleComponent, StyleComponents}, - controller::Controller, + Controller, HighlightingAssets, }; use console::Term; use std::process; diff --git a/src/bin/bat/app.rs b/src/bin/bat/app.rs index 9bace3d4..f2f80bc6 100644 --- a/src/bin/bat/app.rs +++ b/src/bin/bat/app.rs @@ -17,12 +17,12 @@ use console::Term; use ansi_term; use bat::{ - assets::HighlightingAssets, config::{ Config, HighlightedLineRanges, InputFile, LineRange, LineRanges, OutputWrap, PagingMode, StyleComponent, StyleComponents, SyntaxMapping, }, errors::*, + HighlightingAssets, }; fn is_truecolor_terminal() -> bool { diff --git a/src/bin/bat/assets.rs b/src/bin/bat/assets.rs index b75db4be..ed07bdb3 100644 --- a/src/bin/bat/assets.rs +++ b/src/bin/bat/assets.rs @@ -4,7 +4,7 @@ use std::path::PathBuf; use crate::directories::PROJECT_DIRS; -use bat::assets::HighlightingAssets; +use bat::HighlightingAssets; fn theme_set_path() -> PathBuf { PROJECT_DIRS.cache_dir().join("themes.bin") diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs index e58da4ac..c759575c 100644 --- a/src/bin/bat/main.rs +++ b/src/bin/bat/main.rs @@ -24,13 +24,13 @@ use ansi_term::Style; use crate::{app::App, config::config_file}; use assets::{assets_from_cache_or_binary, cache_dir, clear_assets, config_dir}; -use bat::controller::Controller; +use bat::Controller; use directories::PROJECT_DIRS; use bat::{ - assets::HighlightingAssets, config::{Config, InputFile, StyleComponent, StyleComponents}, errors::*, + HighlightingAssets, }; fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> { @@ -12,9 +12,9 @@ extern crate shell_words; extern crate syntect; extern crate wild; -pub mod assets; +pub(crate) mod assets; pub mod config; -pub mod controller; +pub(crate) mod controller; mod decorations; mod diff; pub mod errors; @@ -23,8 +23,12 @@ mod less; pub(crate) mod line_range; mod output; mod preprocessor; -mod printer; +pub(crate) mod printer; pub(crate) mod style; pub(crate) mod syntax_mapping; mod terminal; pub(crate) mod wrap; + +pub use assets::HighlightingAssets; +pub use controller::Controller; +pub use printer::{InteractivePrinter, Printer, SimplePrinter}; diff --git a/tests/no_duplicate_extensions.rs b/tests/no_duplicate_extensions.rs index cdc96128..20dfc349 100644 --- a/tests/no_duplicate_extensions.rs +++ b/tests/no_duplicate_extensions.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use bat::assets::HighlightingAssets; +use bat::HighlightingAssets; #[test] fn no_duplicate_extensions() { |