From e4882c5c99b9bc75675c39cad90a102286775475 Mon Sep 17 00:00:00 2001
From: Peltoche <dev@halium.fr>
Date: Sat, 9 Feb 2019 11:41:42 +0100
Subject: [PATCH] Fix the module import paths

---
 src/core.rs             | 12 ++++++------
 src/display.rs          | 18 +++++++++---------
 src/icon.rs             |  4 ++--
 src/main.rs             | 17 +++++++----------
 src/meta/date.rs        | 11 +++++------
 src/meta/filetype.rs    |  8 ++++----
 src/meta/indicator.rs   | 10 +++++-----
 src/meta/mod.rs         |  2 +-
 src/meta/name.rs        | 14 +++++++-------
 src/meta/owner.rs       |  2 +-
 src/meta/permissions.rs |  2 +-
 src/meta/size.rs        |  2 +-
 src/meta/symlink.rs     |  2 +-
 src/sort.rs             |  6 +++---
 14 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/src/core.rs b/src/core.rs
index 5dc86ed..dd227f4 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -1,9 +1,9 @@
-use color::{self, Colors};
-use display;
-use flags::{Flags, IconTheme, WhenFlag};
-use icon::{self, Icons};
-use meta::Meta;
-use sort;
+use crate::color::{self, Colors};
+use crate::display;
+use crate::flags::{Flags, IconTheme, WhenFlag};
+use crate::icon::{self, Icons};
+use crate::meta::Meta;
+use crate::sort;
 use std::path::PathBuf;
 use terminal_size::terminal_size;
 
diff --git a/src/display.rs b/src/display.rs
index 2c8bc0f..d93d9f4 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -1,8 +1,8 @@
+use crate::color::Colors;
+use crate::flags::Flags;
+use crate::icon::Icons;
+use crate::meta::{FileType, Meta};
 use ansi_term::{ANSIString, ANSIStrings};
-use color::Colors;
-use flags::Flags;
-use icon::Icons;
-use meta::{FileType, Meta};
 use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
 use terminal_size::terminal_size;
 use unicode_width::UnicodeWidthStr;
@@ -352,11 +352,11 @@ fn detect_size_lengths(metas: &[Meta]) -> (usize, usize) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use color;
-    use color::Colors;
-    use icon;
-    use icon::Icons;
-    use meta::{FileType, Name};
+    use crate::color;
+    use crate::color::Colors;
+    use crate::icon;
+    use crate::icon::Icons;
+    use crate::meta::{FileType, Name};
     use std::path::Path;
 
     #[test]
diff --git a/src/icon.rs b/src/icon.rs
index 285ed61..54121f6 100644
--- a/src/icon.rs
+++ b/src/icon.rs
@@ -1,4 +1,4 @@
-use meta::{FileType, Name};
+use crate::meta::{FileType, Name};
 use std::collections::HashMap;
 
 pub struct Icons {
@@ -308,7 +308,7 @@ impl Icons {
 #[cfg(test)]
 mod test {
     use super::{Icons, Theme, ICON_SPACE};
-    use meta::{FileType, Name, Permissions};
+    use crate::meta::{FileType, Name, Permissions};
     use std::fs::File;
     use tempdir::TempDir;
 
diff --git a/src/main.rs b/src/main.rs
index 197e670..1a092c5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,8 @@
-#![cfg_attr(
-    feature = "cargo-clippy",
-    allow(
-        clippy::cast_precision_loss,
-        clippy::cast_sign_loss,
-        clippy::match_same_arms,
-        clippy::cast_possible_wrap
-    )
+#![allow(
+    clippy::cast_precision_loss,
+    clippy::cast_sign_loss,
+    clippy::match_same_arms,
+    clippy::cast_possible_wrap
 )]
 
 #[macro_use]
@@ -30,8 +27,8 @@ mod icon;
 mod meta;
 mod sort;
 
-use core::Core;
-use flags::Flags;
+use crate::core::Core;
+use crate::flags::Flags;
 use std::path::PathBuf;
 
 fn main() {
diff --git a/src/meta/date.rs b/src/meta/date.rs
index 6fe294c..398316f 100644
--- a/src/meta/date.rs
+++ b/src/meta/date.rs
@@ -1,6 +1,6 @@
+use crate::color::{ColoredString, Colors, Elem};
+use crate::flags::{DateFlag, Flags};
 use chrono_humanize::{Accuracy, HumanTime, Tense};
-use color::{ColoredString, Colors, Elem};
-use flags::{DateFlag, Flags};
 use std::fs::Metadata;
 use std::time::UNIX_EPOCH;
 use time::{Duration, Timespec};
@@ -61,12 +61,11 @@ impl Date {
 #[cfg(test)]
 mod test {
     use super::Date;
+    use crate::color::{Colors, Theme};
+    use crate::flags::{DateFlag, Flags};
     use ansi_term::Colour;
-    use color::{Colors, Theme};
-    use flags::{DateFlag, Flags};
-    use std::env;
-    use std::fs;
     use std::process::Command;
+    use std::{env, fs};
     use time;
 
     #[test]
diff --git a/src/meta/filetype.rs b/src/meta/filetype.rs
index 66146ad..8b137de 100644
--- a/src/meta/filetype.rs
+++ b/src/meta/filetype.rs
@@ -1,5 +1,5 @@
-use color::{ColoredString, Colors, Elem};
-use meta::Permissions;
+use crate::color::{ColoredString, Colors, Elem};
+use crate::meta::Permissions;
 use std::fs::Metadata;
 use std::os::unix::fs::FileTypeExt;
 
@@ -66,9 +66,9 @@ impl FileType {
 #[cfg(test)]
 mod test {
     use super::FileType;
+    use crate::color::{Colors, Theme};
+    use crate::meta::Permissions;
     use ansi_term::Colour;
-    use color::{Colors, Theme};
-    use meta::Permissions;
     use std::fs::File;
     use std::os::unix::fs::symlink;
     use std::os::unix::net::UnixListener;
diff --git a/src/meta/indicator.rs b/src/meta/indicator.rs
index f010e6f..c942513 100644
--- a/src/meta/indicator.rs
+++ b/src/meta/indicator.rs
@@ -1,7 +1,7 @@
+use crate::color::ColoredString;
+use crate::flags::Flags;
+use crate::meta::FileType;
 use ansi_term::ANSIString;
-use color::ColoredString;
-use flags::Flags;
-use meta::FileType;
 
 #[derive(Debug)]
 pub struct Indicator(&'static str);
@@ -34,8 +34,8 @@ impl Indicator {
 #[cfg(test)]
 mod test {
     use super::Indicator;
-    use flags::Flags;
-    use meta::FileType;
+    use crate::flags::Flags;
+    use crate::meta::FileType;
 
     #[test]
     fn test_directory_indicator() {
diff --git a/src/meta/mod.rs b/src/meta/mod.rs
index 5499a71..499b454 100644
--- a/src/meta/mod.rs
+++ b/src/meta/mod.rs
@@ -15,7 +15,7 @@ pub use self::owner::Owner;
 pub use self::permissions::Permissions;
 pub use self::size::Size;
 pub use self::symlink::SymLink;
-pub use icon::Icons;
+pub use crate::icon::Icons;
 
 use std::fs::read_link;
 use std::io::{Error, ErrorKind};
diff --git a/src/meta/name.rs b/src/meta/name.rs
index b4e964b..743195c 100644
--- a/src/meta/name.rs
+++ b/src/meta/name.rs
@@ -1,6 +1,6 @@
-use color::{ColoredString, Colors, Elem};
-use icon::Icons;
-use meta::filetype::FileType;
+use crate::color::{ColoredString, Colors, Elem};
+use crate::icon::Icons;
+use crate::meta::filetype::FileType;
 use std::cmp::{Ordering, PartialOrd};
 use std::path::Path;
 
@@ -90,11 +90,11 @@ impl PartialEq for Name {
 #[cfg(test)]
 mod test {
     use super::Name;
+    use crate::color::{self, Colors};
+    use crate::icon::{self, Icons};
+    use crate::meta::FileType;
+    use crate::meta::Permissions;
     use ansi_term::Colour;
-    use color::{self, Colors};
-    use icon::{self, Icons};
-    use meta::FileType;
-    use meta::Permissions;
     use std::cmp::Ordering;
     use std::fs::{self, File};
     use std::os::unix::fs::symlink;
diff --git a/src/meta/owner.rs b/src/meta/owner.rs
index 878705c..26602d0 100644
--- a/src/meta/owner.rs
+++ b/src/meta/owner.rs
@@ -1,4 +1,4 @@
-use color::{ColoredString, Colors, Elem};
+use crate::color::{ColoredString, Colors, Elem};
 use std::fs::Metadata;
 use std::os::unix::fs::MetadataExt;
 use users::{get_group_by_gid, get_user_by_uid};
diff --git a/src/meta/permissions.rs b/src/meta/permissions.rs
index 81073ab..8a12699 100644
--- a/src/meta/permissions.rs
+++ b/src/meta/permissions.rs
@@ -1,5 +1,5 @@
+use crate::color::{ColoredString, Colors, Elem};
 use ansi_term::ANSIStrings;
-use color::{ColoredString, Colors, Elem};
 use std::fs::Metadata;
 use std::os::unix::fs::PermissionsExt;
 
diff --git a/src/meta/size.rs b/src/meta/size.rs
index 637e8bf..85b51d1 100644
--- a/src/meta/size.rs
+++ b/src/meta/size.rs
@@ -1,4 +1,4 @@
-use color::{ColoredString, Colors, Elem};
+use crate::color::{ColoredString, Colors, Elem};
 use std::fs::Metadata;
 
 #[derive(Debug, PartialEq, Eq)]
diff --git a/src/meta/symlink.rs b/src/meta/symlink.rs
index 0bb612c..996c7ab 100644
--- a/src/meta/symlink.rs
+++ b/src/meta/symlink.rs
@@ -1,5 +1,5 @@
+use crate::color::{ColoredString, Colors, Elem};
 use ansi_term::{ANSIString, ANSIStrings};
-use color::{ColoredString, Colors, Elem};
 use std::fs::read_link;
 use std::path::Path;
 
diff --git a/src/sort.rs b/src/sort.rs
index 8018158..27bffbe 100644
--- a/src/sort.rs
+++ b/src/sort.rs
@@ -1,5 +1,5 @@
-use flags::{DirOrderFlag, Flags, SortFlag, SortOrder};
-use meta::{FileType, Meta};
+use crate::flags::{DirOrderFlag, Flags, SortFlag, SortOrder};
+use crate::meta::{FileType, Meta};
 use std::cmp::Ordering;
 
 pub fn by_meta(a: &Meta, b: &Meta, flags: Flags) -> Ordering {
@@ -77,7 +77,7 @@ fn by_date_with_files_first(a: &Meta, b: &Meta, flags: Flags) -> Ordering {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use flags::Flags;
+    use crate::flags::Flags;
     use std::fs::{create_dir, File};
     use std::process::Command;
     use tempdir::TempDir;