Refactor imports and rename highlighter function

bensadeh · Oct 6, 2024 · 4611a01 · 4611a01
1 parent d38638d
commit 4611a01
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -1,5 +1,5 @@
 use crate::cli::Cli;
-use crate::highlighter::config::CliOpts;
+use crate::highlighter::groups::CliOpts;
 use crate::types::{
     Config, Error, FolderInfo, Input, Output, PathAndLineCount, GENERAL_ERROR, MISUSE_SHELL_BUILTIN, OK,
 };

diff --git a/src/highlighter/config.rs → src/highlighter/groups.rs b/src/highlighter/config.rs → src/highlighter/groups.rs
@@ -67,7 +67,7 @@ impl HighlighterGroups {
     }
 }
 
-pub const fn try_get_highlight_groups(cli: CliOpts) -> Result<HighlighterGroups, ConfigError> {
+pub const fn get_highlighter_groups(cli: CliOpts) -> Result<HighlighterGroups, ConfigError> {
     match determine_highlighter_type(cli) {
         AllHighlightersEnabled => Ok(HighlighterGroups::all_enabled()),
         SomeHighlightersEnabled => Ok(HighlighterGroups {

diff --git a/src/highlighter/mod.rs b/src/highlighter/mod.rs
@@ -1,6 +1,6 @@
-pub mod config;
+pub mod groups;
 
-use crate::highlighter::config::HighlighterGroups;
+use crate::highlighter::groups::HighlighterGroups;
 use crate::theme::Theme;
 use inlet_manifold::highlighter::HighlightBuilder;
 use inlet_manifold::*;

diff --git a/src/main.rs b/src/main.rs
@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
     let config = config::create_config_or_exit_early(&cli);
 
     let cli_options = config::get_cli_opts_for_highlight_groups(&cli);
-    let highlighter_groups = highlighter::config::try_get_highlight_groups(cli_options)?;
+    let highlighter_groups = highlighter::groups::get_highlighter_groups(cli_options)?;
 
     let new_theme = theme::reader::parse_theme(cli.config_path.clone())?;
     let highlighter = highlighter::get_highlighter(highlighter_groups, new_theme)?;