remove direct import of minimad crate

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

7 files changed, 22 insertions, 11 deletions

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;