Clippy: don't nest module inside module with same name

12 files changed, 99 insertions, 104 deletions

diff --git a/src/features/diff_highlight.rs b/src/features/diff_highlight.rs
index 630099e1..fc4544c6 100644
--- a/src/features/diff_highlight.rs
+++ b/src/features/diff_highlight.rs
@@ -62,7 +62,7 @@ pub fn _make_feature(bold: bool) -> Vec<(String, OptionValueFunction)> {
 mod test_utils {
     use std::fs::remove_file;
 
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     #[test]
     fn test_diff_highlight_defaults() {
diff --git a/src/features/diff_so_fancy.rs b/src/features/diff_so_fancy.rs
index d9849a07..fd2317d6 100644
--- a/src/features/diff_so_fancy.rs
+++ b/src/features/diff_so_fancy.rs
@@ -48,7 +48,7 @@ pub fn make_feature() -> Vec<(String, OptionValueFunction)> {
 pub mod tests {
     use std::fs::remove_file;
 
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     #[test]
     fn test_diff_so_fancy_defaults() {
diff --git a/src/features/line_numbers.rs b/src/features/line_numbers.rs
index d5c38488..f9189841 100644
--- a/src/features/line_numbers.rs
+++ b/src/features/line_numbers.rs
@@ -312,9 +312,7 @@ pub mod tests {
     use regex::Captures;
 
     use crate::ansi::strip_ansi_codes;
-    use crate::tests::integration_test_utils::integration_test_utils::{
-        make_config_from_args, run_delta,
-    };
+    use crate::tests::integration_test_utils::{make_config_from_args, run_delta};
 
     use super::*;
 
diff --git a/src/features/mod.rs b/src/features/mod.rs
index 7b0175d7..1fe20910 100644
--- a/src/features/mod.rs
+++ b/src/features/mod.rs
@@ -95,7 +95,7 @@ pub mod tests {
 
     use crate::cli;
     use crate::features::make_builtin_features;
-    use crate::tests::integration_test_utils::integration_test_utils::make_options_from_args_and_git_config;
+    use crate::tests::integration_test_utils::make_options_from_args_and_git_config;
 
     #[test]
     fn test_builtin_features_have_flags_and_these_set_features() {
diff --git a/src/features/navigate.rs b/src/features/navigate.rs
index 0020d54b..4e1e062a 100644
--- a/src/features/navigate.rs
+++ b/src/features/navigate.rs
@@ -123,7 +123,7 @@ fn get_less_hist_file() -> Option<PathBuf> {
 mod tests {
     use std::fs::remove_file;
 
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     #[test]
     fn test_navigate_with_overriden_key_in_main_section() {
diff --git a/src/features/side_by_side.rs b/src/features/side_by_side.rs
index 01e1836c..abb1a16d 100644
--- a/src/features/side_by_side.rs
+++ b/src/features/side_by_side.rs
@@ -460,9 +460,7 @@ fn right_fill_right_panel_line(
 pub mod tests {
     use crate::ansi::strip_ansi_codes;
     use crate::features::line_numbers::tests::*;
-    use crate::tests::integration_test_utils::integration_test_utils::{
-        make_config_from_args, run_delta,
-    };
+    use crate::tests::integration_test_utils::{make_config_from_args, run_delta};
 
     #[test]
     fn test_two_minus_lines() {
diff --git a/src/main.rs b/src/main.rs
index d75f3f16..94b4c745 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -516,7 +516,7 @@ mod main_tests {
     use std::io::{Cursor, Seek, SeekFrom};
 
     use crate::ansi;
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     #[test]
     fn test_show_config() {
diff --git a/src/options/get.rs b/src/options/get.rs
index e946c846..6026fb50 100644
--- a/src/options/get.rs
+++ b/src/options/get.rs
@@ -139,7 +139,7 @@ pub mod tests {
     use std::fs::remove_file;
 
     use crate::options::get::get_themes;
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     // TODO: the followig tests are collapsed into one since they all set the same env var and thus
     // could affect each other if allowed to run concurrently.
diff --git a/src/options/set.rs b/src/options/set.rs
index ef0a259c..063c999c 100644
--- a/src/options/set.rs
+++ b/src/options/set.rs
@@ -619,7 +619,7 @@ pub mod tests {
 
     use crate::bat_utils::output::PagingMode;
     use crate::cli;
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     #[test]
     fn test_options_can_be_set_in_git_config() {
diff --git a/src/options/theme.rs b/src/options/theme.rs
index 52de3ea0..5b5dffaa 100644
--- a/src/options/theme.rs
+++ b/src/options/theme.rs
@@ -123,7 +123,7 @@ mod tests {
 
     use super::*;
     use crate::color;
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
 
     #[test]
     fn test_syntax_theme_selection() {
diff --git a/src/tests/integration_test_utils.rs b/src/tests/integration_test_utils.rs
index 1fdb215a..7cab6f84 100644
--- a/src/tests/integration_test_utils.rs
+++ b/src/tests/integration_test_utils.rs
@@ -1,102 +1,101 @@
-#[cfg(test)]
-pub mod integration_test_utils {
-    use std::fs::File;
-    use std::io::{BufReader, Write};
-    use std::path::Path;
+#![cfg(test)]
 
-    use bytelines::ByteLines;
-    use itertools;
+use std::fs::File;
+use std::io::{BufReader, Write};
+use std::path::Path;
 
-    use crate::ansi;
-    use crate::cli;
-    use crate::config;
-    use crate::delta::delta;
-    use crate::git_config::GitConfig;
+use bytelines::ByteLines;
+use itertools;
 
-    pub fn make_options_from_args_and_git_config(
-        args: &[&str],
-        git_config_contents: Option<&[u8]>,
-        git_config_path: Option<&str>,
-    ) -> cli::Opt {
-        _make_options_from_args_and_git_config(args, git_config_contents, git_config_path, false)
-    }
+use crate::ansi;
+use crate::cli;
+use crate::config;
+use crate::delta::delta;
+use crate::git_config::GitConfig;
 
-    pub fn make_options_from_args_and_git_config_honoring_env_var(
-        args: &[&str],
-        git_config_contents: Option<&[u8]>,
-        git_config_path: Option<&str>,
-    ) -> cli::Opt {
-        _make_options_from_args_and_git_config(args, git_config_contents, git_config_path, true)
-    }
+pub fn make_options_from_args_and_git_config(
+    args: &[&str],
+    git_config_contents: Option<&[u8]>,
+    git_config_path: Option<&str>,
+) -> cli::Opt {
+    _make_options_from_args_and_git_config(args, git_config_contents, git_config_path, false)
+}
 
-    fn _make_options_from_args_and_git_config(
-        args: &[&str],
-        git_config_contents: Option<&[u8]>,
-        git_config_path: Option<&str>,
-        honor_env_var: bool,
-    ) -> cli::Opt {
-        let mut args: Vec<&str> = itertools::chain(&["/dev/null", "/dev/null"], args)
-            .map(|s| *s)
-            .collect();
-        let mut git_config = match (git_config_contents, git_config_path) {
-            (Some(contents), Some(path)) => Some(make_git_config(contents, path, honor_env_var)),
-            _ => {
-                args.push("--no-gitconfig");
-                None
-            }
-        };
-        cli::Opt::from_iter_and_git_config(args, &mut git_config)
-    }
+pub fn make_options_from_args_and_git_config_honoring_env_var(
+    args: &[&str],
+    git_config_contents: Option<&[u8]>,
+    git_config_path: Option<&str>,
+) -> cli::Opt {
+    _make_options_from_args_and_git_config(args, git_config_contents, git_config_path, true)
+}
 
-    pub fn make_options_from_args(args: &[&str]) -> cli::Opt {
-        make_options_from_args_and_git_config(args, None, None)
-    }
+fn _make_options_from_args_and_git_config(
+    args: &[&str],
+    git_config_contents: Option<&[u8]>,
+    git_config_path: Option<&str>,
+    honor_env_var: bool,
+) -> cli::Opt {
+    let mut args: Vec<&str> = itertools::chain(&["/dev/null", "/dev/null"], args)
+        .map(|s| *s)
+        .collect();
+    let mut git_config = match (git_config_contents, git_config_path) {
+        (Some(contents), Some(path)) => Some(make_git_config(contents, path, honor_env_var)),
+        _ => {
+            args.push("--no-gitconfig");
+            None
+        }
+    };
+    cli::Opt::from_iter_and_git_config(args, &mut git_config)
+}
 
-    #[allow(dead_code)]
-    pub fn make_config_from_args_and_git_config(
-        args: &[&str],
-        git_config_contents: Option<&[u8]>,
-        git_config_path: Option<&str>,
-    ) -> config::Config {
-        config::Config::from(make_options_from_args_and_git_config(
-            args,
-            git_config_contents,
-            git_config_path,
-        ))
-    }
+pub fn make_options_from_args(args: &[&str]) -> cli::Opt {
+    make_options_from_args_and_git_config(args, None, None)
+}
 
-    pub fn make_config_from_args(args: &[&str]) -> config::Config {
-        config::Config::from(make_options_from_args(args))
-    }
+#[allow(dead_code)]
+pub fn make_config_from_args_and_git_config(
+    args: &[&str],
+    git_config_contents: Option<&[u8]>,
+    git_config_path: Option<&str>,
+) -> config::Config {
+    config::Config::from(make_options_from_args_and_git_config(
+        args,
+        git_config_contents,
+        git_config_path,
+    ))
+}
 
-    pub fn make_git_config(contents: &[u8], path: &str, honor_env_var: bool) -> GitConfig {
-        let path = Path::new(path);
-        let mut file = File::create(path).unwrap();
-        file.write_all(contents).unwrap();
-        GitConfig::from_path(&path, honor_env_var)
-    }
+pub fn make_config_from_args(args: &[&str]) -> config::Config {
+    config::Config::from(make_options_from_args(args))
+}
+
+pub fn make_git_config(contents: &[u8], path: &str, honor_env_var: bool) -> GitConfig {
+    let path = Path::new(path);
+    let mut file = File::create(path).unwrap();
+    file.write_all(contents).unwrap();
+    GitConfig::from_path(&path, honor_env_var)
+}
 
-    pub fn get_line_of_code_from_delta(
-        input: &str,
-        line_number: usize,
-        expected_text: &str,
-        config: &config::Config,
-    ) -> String {
-        let output = run_delta(&input, config);
-        let line_of_code = output.lines().nth(line_number).unwrap();
-        assert!(ansi::strip_ansi_codes(line_of_code) == expected_text);
-        line_of_code.to_string()
-    }
+pub fn get_line_of_code_from_delta(
+    input: &str,
+    line_number: usize,
+    expected_text: &str,
+    config: &config::Config,
+) -> String {
+    let output = run_delta(&input, config);
+    let line_of_code = output.lines().nth(line_number).unwrap();
+    assert!(ansi::strip_ansi_codes(line_of_code) == expected_text);
+    line_of_code.to_string()
+}
 
-    pub fn run_delta(input: &str, config: &config::Config) -> String {
-        let mut writer: Vec<u8> = Vec::new();
+pub fn run_delta(input: &str, config: &config::Config) -> String {
+    let mut writer: Vec<u8> = Vec::new();
 
-        delta(
-            ByteLines::new(BufReader::new(input.as_bytes())),
-            &mut writer,
-            &config,
-        )
-        .unwrap();
-        String::from_utf8(writer).unwrap()
-    }
+    delta(
+        ByteLines::new(BufReader::new(input.as_bytes())),
+        &mut writer,
+        &config,
+    )
+    .unwrap();
+    String::from_utf8(writer).unwrap()
 }
diff --git a/src/tests/test_example_diffs.rs b/src/tests/test_example_diffs.rs
index 37bb2597..d9e32ae4 100644
--- a/src/tests/test_example_diffs.rs
+++ b/src/tests/test_example_diffs.rs
@@ -5,7 +5,7 @@ mod tests {
     use crate::delta::State;
     use crate::style;
     use crate::tests::ansi_test_utils::ansi_test_utils;
-    use crate::tests::integration_test_utils::integration_test_utils;
+    use crate::tests::integration_test_utils;
     use crate::tests::test_utils::test_utils;
 
     #[test]