Merge pull request #48 from epage/dup

refactor: Reduce reuse

Author: epage

src/path/fc.rs

@@ -10,23 +10,18 @@ use std::fmt;
 use std::fs;
 use std::io::{self, Read};
 use std::path;
-use std::str;
 
 use Predicate;
 
 #[derive(Clone, Debug, PartialEq)]
-pub struct FileContent(Vec<u8>);
+struct FileContent(Vec<u8>);
 
 impl FileContent {
     pub fn new(path: &path::Path) -> io::Result<FileContent> {
         let mut buffer = Vec::new();
         fs::File::open(path)?.read_to_end(&mut buffer)?;
         Ok(FileContent(buffer))
     }
-
-    pub fn utf8(&self) -> Result<&str, str::Utf8Error> {
-        str::from_utf8(&self.0)
-    }
 }
 
 /// Predicate adaper that converts a `path` to file content predicate to byte predicate.

src/path/fs.rs

@@ -7,11 +7,27 @@
 // except according to those terms.
 
 use std::fmt;
-use std::io;
+use std::fs;
+use std::io::{self, Read};
 use std::path;
+use std::str;
 
 use Predicate;
-use path::fc::FileContent;
+
+#[derive(Clone, Debug, PartialEq)]
+struct FileContent(Vec<u8>);
+
+impl FileContent {
+    pub fn new(path: &path::Path) -> io::Result<FileContent> {
+        let mut buffer = Vec::new();
+        fs::File::open(path)?.read_to_end(&mut buffer)?;
+        Ok(FileContent(buffer))
+    }
+
+    pub fn utf8(&self) -> Result<&str, str::Utf8Error> {
+        str::from_utf8(&self.0)
+    }
+}
 
 /// Predicate that compares file matches
 #[derive(Clone, Debug)]