Release 0.2.0 and support binary files

While fixing #3, I realized I had some stuff backwards. I don't know why
exactly, but now things should be good.

Fixes #3.

Author: steveklabnik

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["steveklabnik <steve@steveklabnik.com>"]
 name = "dir-diff"
-version = "0.1.0"
+version = "0.2.0"
 description = "Do two directories have different contents?"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/steveklabnik/dir-diff"
@@ -10,5 +10,4 @@ readme = "README.md"
 tags = ["directory", "diff", "fs"]
 
 [dependencies]
-diff = "0.1.10"
 walkdir = "1.0.7"

src/lib.rs

@@ -11,7 +11,6 @@
 //! assert!(dir_diff::is_different("dir/a", "dir/b").unwrap());
 //! ```
 
-extern crate diff;
 extern crate walkdir;
 
 use std::fs::File;
@@ -61,25 +60,21 @@ pub fn is_different<A: AsRef<Path>, B: AsRef<Path>>(a_base: A, b_base: B) -> Res
             }
         }
 
-        let a_text = read_to_string(a)?;
-        let b_text = read_to_string(b)?;
+        let a_text = read_to_vec(a)?;
+        let b_text = read_to_vec(b)?;
 
-        for result in diff::lines(&a_text, &b_text) {
-            match result {
-                diff::Result::Both(..) => (),
-                _ => return Ok(false),
-            }
+        if a_text != b_text {
+            return Ok(true);
         }
     }
-
-    Ok(true)
+    Ok(false)
 }
 
-fn read_to_string<P: AsRef<Path>>(file: P) -> Result<String, std::io::Error> {
-    let mut data = String::new();
+fn read_to_vec<P: AsRef<Path>>(file: P) -> Result<Vec<u8>, std::io::Error> {
+    let mut data = Vec::new();
     let mut file = File::open(file.as_ref())?;
 
-    file.read_to_string(&mut data)?;
+    file.read_to_end(&mut data)?;
 
     Ok(data)
 }

tests/binary/bad/dir1/rust-logo.png

@@ -2,10 +2,20 @@ extern crate dir_diff;
 
 #[test]
 fn easy_good() {
-    assert!(dir_diff::is_different("tests/easy/good/dir1", "tests/easy/good/dir2").unwrap());
+    assert!(!dir_diff::is_different("tests/easy/good/dir1", "tests/easy/good/dir2").unwrap());
 }
 
 #[test]
 fn easy_bad() {
-    assert!(!dir_diff::is_different("tests/easy/bad/dir1", "tests/easy/bad/dir2").unwrap());
+    assert!(dir_diff::is_different("tests/easy/bad/dir1", "tests/easy/bad/dir2").unwrap());
+}
+
+#[test]
+fn binary_good() {
+    assert!(!dir_diff::is_different("tests/binary/good/dir1", "tests/binary/good/dir2").unwrap());
+}
+
+#[test]
+fn binary_bad() {
+    assert!(dir_diff::is_different("tests/binary/bad/dir1", "tests/binary/bad/dir2").unwrap());
 }