summaryrefslogtreecommitdiffstats
path: root/src/features
diff options
context:
space:
mode:
Diffstat (limited to 'src/features')
-rw-r--r--src/features/diff_highlight.rs2
-rw-r--r--src/features/diff_so_fancy.rs2
-rw-r--r--src/features/line_numbers.rs4
-rw-r--r--src/features/mod.rs2
-rw-r--r--src/features/navigate.rs2
-rw-r--r--src/features/side_by_side.rs4
6 files changed, 6 insertions, 10 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() {