remove direct import of minimad crate

because there's some bug I don't understand in crate resolution
in the last versions of rust

9 files changed, 24 insertions, 15 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 448e99b..fe0434e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -140,7 +140,7 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "broot"
-version = "1.6.5-dev"
+version = "1.6.5"
 dependencies = [
  "ahash 0.7.4",
  "ansi_colours",
@@ -167,7 +167,6 @@ dependencies = [
  "lfs-core",
  "libc",
  "memmap",
- "minimad 0.9.0",
  "once_cell",
  "open 2.0.0",
  "pathdiff",
diff --git a/Cargo.toml b/Cargo.toml
index a28543e..84e5eb6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "broot"
-version = "1.6.5-dev"
+version = "1.6.5"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 repository = "https://github.com/Canop/broot"
 documentation = "https://dystroy.org/broot"
@@ -39,7 +39,6 @@ id-arena = "2.2.1"
 image = "0.23.14"
 lazy-regex = "2.2.2"
 libc = "0.2"
-minimad = "0.9.0"
 once_cell = "1.7"
 open = "2.0"
 memmap = "0.7"
diff --git a/src/app/panel.rs b/src/app/panel.rs
index f4a6d30..57aa2f3 100644
--- a/src/app/panel.rs
+++ b/src/app/panel.rs
@@ -17,8 +17,10 @@ use {
         task_sync::Dam,
         verb::*,
     },
-    minimad::{Alignment, Composite},
-    termimad::Event,
+    termimad::{
+        minimad::{Alignment, Composite},
+        Event,
+    },
 };
 
 /// A colon on screen containing a stack of states, the top
diff --git a/src/display/matched_string.rs b/src/display/matched_string.rs
index 8f962a0..3bdf27d 100644
--- a/src/display/matched_string.rs
+++ b/src/display/matched_string.rs
@@ -1,8 +1,10 @@
 use {
     super::{CropWriter, SPACE_FILLING},
     crate::pattern::NameMatch,
-    minimad::Alignment,
-    termimad::{CompoundStyle, StrFit},
+    termimad::{
+        minimad::Alignment,
+        CompoundStyle, StrFit,
+    },
 };
 
 pub struct MatchedString<'a> {
diff --git a/src/display/status_line.rs b/src/display/status_line.rs
index 70bfbe0..edb261c 100644
--- a/src/display/status_line.rs
+++ b/src/display/status_line.rs
@@ -5,8 +5,10 @@ use {
         errors::ProgramError,
         skin::PanelSkin,
     },
-    minimad::{Alignment, Composite},
-    termimad::{Area, StyledChar},
+    termimad::{
+        minimad::{Alignment, Composite},
+        Area, StyledChar,
+    },
 };
 
 /// write the whole status line (task + status)
diff --git a/src/filesystems/filesystems_state.rs b/src/filesystems/filesystems_state.rs
index 3082b18..aba110b 100644
--- a/src/filesystems/filesystems_state.rs
+++ b/src/filesystems/filesystems_state.rs
@@ -17,7 +17,6 @@ use {
         QueueableCommand,
     },
     lfs_core::Mount,
-    minimad::Alignment,
     std::{
         convert::TryInto,
         fs,
@@ -25,7 +24,10 @@ use {
         path::Path,
     },
     strict::NonEmptyVec,
-    termimad::*,
+    termimad::{
+        minimad::Alignment,
+        *,
+    },
 };
 
 struct FilteredContent {
diff --git a/src/help/help_content.rs b/src/help/help_content.rs
index 672aeb5..4ccac3a 100644
--- a/src/help/help_content.rs
+++ b/src/help/help_content.rs
@@ -1,5 +1,5 @@
 use {
-    minimad::{TextTemplate, TextTemplateExpander},
+    termimad::minimad::{TextTemplate, TextTemplateExpander},
 };
 
 static MD: &str = r#"
diff --git a/src/shell_install/bash.rs b/src/shell_install/bash.rs
index 4343b58..6516400 100644
--- a/src/shell_install/bash.rs
+++ b/src/shell_install/bash.rs
@@ -19,7 +19,10 @@ use {
     lazy_regex::regex,
     regex::Captures,
     std::{env, fs::OpenOptions, io::Write, path::PathBuf},
-    termimad::mad_print_inline,
+    termimad::{
+        minimad,
+        mad_print_inline,
+    },
 };
 
 const NAME: &str = "bash";
diff --git a/src/shell_install/mod.rs b/src/shell_install/mod.rs
index e6a54b8..73b8ac8 100644
--- a/src/shell_install/mod.rs
+++ b/src/shell_install/mod.rs
@@ -5,7 +5,7 @@ use {
         path::{Path, PathBuf},
         str::FromStr,
     },
-    termimad::{mad_print_inline, MadSkin},
+    termimad::{minimad, mad_print_inline, MadSkin},
 };
 
 mod bash;