Merge pull request #55 from epage/clean

style: Update to 2018 edition

Author: epage

Cargo.toml

@@ -10,6 +10,7 @@ documentation = "http://docs.rs/assert_fs/"
 readme = "README.md"
 categories = ["development-tools::testing"]
 keywords = ["filesystem", "test", "assert", "fixture"]
+edition = "2018"
 
 [dependencies]
 tempfile = "3.0"

src/assert.rs

@@ -34,7 +34,7 @@ use predicates::str::PredicateStrExt;
 use predicates_core;
 use predicates_tree::CaseTreeExt;
 
-use fixture;
+use crate::fixture;
 
 /// Assert the state of files within [`TempDir`].
 ///
@@ -240,12 +240,12 @@ impl BytesContentPathPredicate {
 impl predicates_core::reflection::PredicateReflection for BytesContentPathPredicate {
     fn parameters<'a>(
         &'a self,
-    ) -> Box<Iterator<Item = predicates_core::reflection::Parameter<'a>> + 'a> {
+    ) -> Box<dyn Iterator<Item = predicates_core::reflection::Parameter<'a>> + 'a> {
         self.0.parameters()
     }
 
     /// Nested `Predicate`s of the current `Predicate`.
-    fn children<'a>(&'a self) -> Box<Iterator<Item = predicates_core::reflection::Child<'a>> + 'a> {
+    fn children<'a>(&'a self) -> Box<dyn Iterator<Item = predicates_core::reflection::Child<'a>> + 'a> {
         self.0.children()
     }
 }
@@ -265,7 +265,7 @@ impl predicates_core::Predicate<path::Path> for BytesContentPathPredicate {
 }
 
 impl fmt::Display for BytesContentPathPredicate {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
     }
 }
@@ -316,12 +316,12 @@ impl StrContentPathPredicate {
 impl predicates_core::reflection::PredicateReflection for StrContentPathPredicate {
     fn parameters<'a>(
         &'a self,
-    ) -> Box<Iterator<Item = predicates_core::reflection::Parameter<'a>> + 'a> {
+    ) -> Box<dyn Iterator<Item = predicates_core::reflection::Parameter<'a>> + 'a> {
         self.0.parameters()
     }
 
     /// Nested `Predicate`s of the current `Predicate`.
-    fn children<'a>(&'a self) -> Box<Iterator<Item = predicates_core::reflection::Child<'a>> + 'a> {
+    fn children<'a>(&'a self) -> Box<dyn Iterator<Item = predicates_core::reflection::Child<'a>> + 'a> {
         self.0.children()
     }
 }
@@ -341,7 +341,7 @@ impl predicates_core::Predicate<path::Path> for StrContentPathPredicate {
 }
 
 impl fmt::Display for StrContentPathPredicate {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
     }
 }
@@ -400,12 +400,12 @@ where
 {
     fn parameters<'a>(
         &'a self,
-    ) -> Box<Iterator<Item = predicates_core::reflection::Parameter<'a>> + 'a> {
+    ) -> Box<dyn Iterator<Item = predicates_core::reflection::Parameter<'a>> + 'a> {
         self.0.parameters()
     }
 
     /// Nested `Predicate`s of the current `Predicate`.
-    fn children<'a>(&'a self) -> Box<Iterator<Item = predicates_core::reflection::Child<'a>> + 'a> {
+    fn children<'a>(&'a self) -> Box<dyn Iterator<Item = predicates_core::reflection::Child<'a>> + 'a> {
         self.0.children()
     }
 }
@@ -431,7 +431,7 @@ impl<P> fmt::Display for StrPathPredicate<P>
 where
     P: predicates_core::Predicate<str>,
 {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
     }
 }

src/fixture/errors.rs

@@ -58,7 +58,7 @@ pub enum FixtureKind {
 }
 
 impl fmt::Display for FixtureKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             FixtureKind::Walk => write!(f, "Failed when walking the source tree,"),
             FixtureKind::CopyFile => write!(f, "Failed when copying a file."),
@@ -74,7 +74,7 @@ impl fmt::Display for FixtureKind {
 #[derive(Debug)]
 pub struct FixtureError {
     kind: FixtureKind,
-    cause: Option<Box<Error + Send + Sync + 'static>>,
+    cause: Option<Box<dyn Error + Send + Sync + 'static>>,
 }
 
 impl FixtureError {
@@ -94,16 +94,16 @@ impl Error for FixtureError {
         "Failed to initialize fixture"
     }
 
-    fn cause(&self) -> Option<&Error> {
+    fn cause(&self) -> Option<&dyn Error> {
         self.cause.as_ref().map(|c| {
-            let c: &Error = c.as_ref();
+            let c: &dyn Error = c.as_ref();
             c
         })
     }
 }
 
 impl fmt::Display for FixtureError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.cause {
             Some(ref cause) => write!(
                 f,

src/lib.rs

@@ -64,33 +64,27 @@
 
 #![warn(missing_docs)]
 
-extern crate globwalk;
-extern crate predicates;
-extern crate predicates_core;
-extern crate predicates_tree;
-extern crate tempfile;
-
 pub mod assert;
 pub mod fixture;
 
 // Pulling this in for convenience-sake
 #[doc(inline)]
-pub use fixture::TempDir;
+pub use crate::fixture::TempDir;
 
 // Pulling this in for convenience-sake
 #[doc(inline)]
-pub use fixture::NamedTempFile;
+pub use crate::fixture::NamedTempFile;
 
 /// Extension traits that are useful to have available.
 pub mod prelude {
-    pub use assert::PathAssert;
-    pub use fixture::FileTouch;
-    pub use fixture::FileWriteBin;
-    pub use fixture::FileWriteFile;
-    pub use fixture::FileWriteStr;
-    pub use fixture::PathChild;
-    pub use fixture::PathCopy;
-    pub use fixture::PathCreateDir;
+    pub use crate::assert::PathAssert;
+    pub use crate::fixture::FileTouch;
+    pub use crate::fixture::FileWriteBin;
+    pub use crate::fixture::FileWriteFile;
+    pub use crate::fixture::FileWriteStr;
+    pub use crate::fixture::PathChild;
+    pub use crate::fixture::PathCopy;
+    pub use crate::fixture::PathCreateDir;
 }
 
 #[macro_use]

tests/assert.rs

@@ -1,5 +1,4 @@
-extern crate assert_fs;
-extern crate predicates;
+use assert_fs;
 
 use assert_fs::prelude::*;
 use predicates::prelude::*;