From 2475c7524736cc70c8c96e183293b46a5a2fce83 Mon Sep 17 00:00:00 2001 From: Alex Lyon Date: Wed, 24 Apr 2019 02:59:29 -0700 Subject: [PATCH] Update to Rust 2018 --- Cargo.toml | 1 + src/find/matchers/exec.rs | 2 +- src/find/matchers/logical_matchers.rs | 8 ++++---- src/find/matchers/mod.rs | 8 ++++---- src/find/matchers/name.rs | 8 ++++---- src/find/matchers/perm.rs | 8 ++++---- src/find/matchers/printer.rs | 10 +++++----- src/find/matchers/prune.rs | 8 ++++---- src/find/matchers/size.rs | 8 ++++---- src/find/matchers/time.rs | 8 ++++---- src/find/matchers/type_matcher.rs | 8 ++++---- src/find/mod.rs | 2 +- 12 files changed, 40 insertions(+), 39 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6ba05b7..2e2de98 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "findutils" version = "0.1.0" authors = ["mcharsley "] +edition = "2018" [dependencies] glob = "0.3" diff --git a/src/find/matchers/exec.rs b/src/find/matchers/exec.rs index 65c7904..87b7bf7 100644 --- a/src/find/matchers/exec.rs +++ b/src/find/matchers/exec.rs @@ -11,7 +11,7 @@ use std::path::Path; use std::process::Command; use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; enum Arg { Filename, diff --git a/src/find/matchers/logical_matchers.rs b/src/find/matchers/logical_matchers.rs index 903683f..c362f96 100644 --- a/src/find/matchers/logical_matchers.rs +++ b/src/find/matchers/logical_matchers.rs @@ -14,7 +14,7 @@ use std::iter::Iterator; use std::path::PathBuf; use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; /// This matcher contains a collection of other matchers. A file only matches /// if it matches ALL the contained sub-matchers. For sub-matchers that have @@ -341,10 +341,10 @@ impl Matcher for NotMatcher { mod tests { use walkdir::DirEntry; - use find::matchers::tests::get_dir_entry_for; + use crate::find::matchers::tests::get_dir_entry_for; use super::*; - use find::matchers::{Matcher, MatcherIO}; - use find::tests::FakeDependencies; + use crate::find::matchers::{Matcher, MatcherIO}; + use crate::find::tests::FakeDependencies; /// Simple Matcher impl that has side effects pub struct HasSideEffects {} diff --git a/src/find/matchers/mod.rs b/src/find/matchers/mod.rs index 614c103..e924f63 100644 --- a/src/find/matchers/mod.rs +++ b/src/find/matchers/mod.rs @@ -20,7 +20,7 @@ use std::path::PathBuf; use std::time::SystemTime; use walkdir::DirEntry; -use find::{Config, Dependencies}; +use super::{Config, Dependencies}; @@ -378,9 +378,9 @@ fn build_matcher_tree(args: &[&str], #[cfg(test)] mod tests { use walkdir::{DirEntry, WalkDir}; - use find::Config; - use find::tests::fix_up_slashes; - use find::tests::FakeDependencies; + use crate::find::Config; + use crate::find::tests::fix_up_slashes; + use crate::find::tests::FakeDependencies; use super::*; diff --git a/src/find/matchers/name.rs b/src/find/matchers/name.rs index 146e552..795901b 100644 --- a/src/find/matchers/name.rs +++ b/src/find/matchers/name.rs @@ -8,7 +8,7 @@ use glob::Pattern; use glob::PatternError; use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; /// This matcher makes a case-sensitive comparison of the name against a /// shell wildcard pattern. See `glob::Pattern` for details on the exact @@ -63,9 +63,9 @@ impl super::Matcher for CaselessNameMatcher { #[cfg(test)] mod tests { - use find::matchers::Matcher; - use find::matchers::tests::get_dir_entry_for; - use find::tests::FakeDependencies; + use crate::find::matchers::Matcher; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::tests::FakeDependencies; use super::*; diff --git a/src/find/matchers/perm.rs b/src/find/matchers/perm.rs index 90cedc3..5d0ca76 100644 --- a/src/find/matchers/perm.rs +++ b/src/find/matchers/perm.rs @@ -14,7 +14,7 @@ use std::io::{stderr, Write}; use std::str::FromStr; use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; #[derive(Clone, Copy, Debug, Eq, PartialEq)] @@ -321,9 +321,9 @@ impl Matcher for PermMatcher { #[cfg(test)] #[cfg(unix)] mod tests { - use find::matchers::Matcher; - use find::matchers::tests::get_dir_entry_for; - use find::tests::FakeDependencies; + use crate::find::matchers::Matcher; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::tests::FakeDependencies; use super::*; use super::parsing; diff --git a/src/find/matchers/printer.rs b/src/find/matchers/printer.rs index 1926315..7cb71c8 100644 --- a/src/find/matchers/printer.rs +++ b/src/find/matchers/printer.rs @@ -6,7 +6,7 @@ use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; /// This matcher just prints the name of the file to stdout. pub struct Printer; @@ -38,10 +38,10 @@ impl Matcher for Printer { #[cfg(test)] mod tests { - use find::matchers::tests::get_dir_entry_for; - use find::matchers::Matcher; - use find::tests::FakeDependencies; - use find::tests::fix_up_slashes; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::matchers::Matcher; + use crate::find::tests::FakeDependencies; + use crate::find::tests::fix_up_slashes; use super::*; #[test] diff --git a/src/find/matchers/prune.rs b/src/find/matchers/prune.rs index 0f5fa9b..abe32da 100644 --- a/src/find/matchers/prune.rs +++ b/src/find/matchers/prune.rs @@ -6,7 +6,7 @@ use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; /// This matcher checks the type of the file. pub struct PruneMatcher; @@ -30,9 +30,9 @@ impl Matcher for PruneMatcher { #[cfg(test)] mod tests { - use find::matchers::Matcher; - use find::matchers::tests::get_dir_entry_for; - use find::tests::FakeDependencies; + use crate::find::matchers::Matcher; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::tests::FakeDependencies; use super::*; #[test] diff --git a/src/find/matchers/size.rs b/src/find/matchers/size.rs index cb68e50..866fc05 100644 --- a/src/find/matchers/size.rs +++ b/src/find/matchers/size.rs @@ -9,7 +9,7 @@ use std::io::{stderr, Write}; use std::str::FromStr; use walkdir::DirEntry; -use find::matchers::{ComparableValue, Matcher, MatcherIO}; +use super::{ComparableValue, Matcher, MatcherIO}; #[derive(Clone, Copy, Debug)] enum Unit { @@ -107,9 +107,9 @@ impl Matcher for SizeMatcher { #[cfg(test)] mod tests { - use find::matchers::{ComparableValue, Matcher}; - use find::matchers::tests::get_dir_entry_for; - use find::tests::FakeDependencies; + use crate::find::matchers::{ComparableValue, Matcher}; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::tests::FakeDependencies; use super::*; // need to explicitly use non-pub members use super::{byte_size_to_unit_size, Unit}; diff --git a/src/find/matchers/time.rs b/src/find/matchers/time.rs index 62e4f55..1a84c5c 100644 --- a/src/find/matchers/time.rs +++ b/src/find/matchers/time.rs @@ -11,7 +11,7 @@ use std::io::{stderr, Write}; use std::time::SystemTime; use walkdir::DirEntry; -use find::matchers::{ComparableValue, Matcher, MatcherIO}; +use super::{ComparableValue, Matcher, MatcherIO}; const SECONDS_PER_DAY: i64 = 60 * 60 * 24; @@ -147,9 +147,9 @@ mod tests { use tempdir::TempDir; use walkdir::DirEntry; - use find::matchers::{ComparableValue, Matcher}; - use find::matchers::tests::get_dir_entry_for; - use find::tests::FakeDependencies; + use crate::find::matchers::{ComparableValue, Matcher}; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::tests::FakeDependencies; use super::*; #[test] diff --git a/src/find/matchers/type_matcher.rs b/src/find/matchers/type_matcher.rs index b5579d4..e345a8f 100644 --- a/src/find/matchers/type_matcher.rs +++ b/src/find/matchers/type_matcher.rs @@ -8,7 +8,7 @@ use std::error::Error; use std::fs::FileType; use walkdir::DirEntry; -use find::matchers::{Matcher, MatcherIO}; +use super::{Matcher, MatcherIO}; /// This matcher checks the type of the file. pub struct TypeMatcher { @@ -41,9 +41,9 @@ impl Matcher for TypeMatcher { #[cfg(test)] mod tests { - use find::matchers::Matcher; - use find::matchers::tests::get_dir_entry_for; - use find::tests::FakeDependencies; + use crate::find::matchers::Matcher; + use crate::find::matchers::tests::get_dir_entry_for; + use crate::find::tests::FakeDependencies; use super::*; #[test] diff --git a/src/find/mod.rs b/src/find/mod.rs index cded6fe..b844f5a 100644 --- a/src/find/mod.rs +++ b/src/find/mod.rs @@ -212,7 +212,7 @@ mod tests { use std::vec::Vec; use tempdir::TempDir; - use find::matchers::MatcherIO; + use crate::find::matchers::MatcherIO; use super::*;