use rustfmt 0.6.0 (#61)

.travis.yml

@@ -15,7 +15,7 @@ os:
 #  - osx
 
 before_script:
-- cargo install --force --vers 0.6.1 rustfmt || true
+- make -f travis-build/Makefile prepare-rustfmt
 
 script:
 - cargo fmt && git diff-index --quiet HEAD -- || (echo please make format and run tests before creating a pr!; exit 1)
@@ -26,3 +26,4 @@ env:
   global:
   - RUST_TEST_THREADS=1
   - LD_LIBRARY_PATH: "/usr/local/lib"
+  - RUSTFMT_VERSION=v0.6.0

circle.yml

@@ -41,7 +41,7 @@ dependencies:
       else
         rustup default "nightly-${RUSTC_DATE}";
       fi
-    - cargo install --force --vers 0.6.1 rustfmt || true
+    - make -f travis-build/Makefile prepare-rustfmt
     - |
       if [[ ! -e $HOME/.local/lib/librocksdb.so ]]; then
         export CPLUS_INCLUDE_PATH="${LOCAL_PREFIX}/include" && \

tests/test_iterator.rs

@@ -56,9 +56,8 @@ pub fn test_iterator() {
     assert!(p.is_ok());
     let p = db.put(k3, v3);
     assert!(p.is_ok());
-    let expected = vec![(k1.to_vec(), v1.to_vec()),
-                        (k2.to_vec(), v2.to_vec()),
-                        (k3.to_vec(), v3.to_vec())];
+    let expected =
+        vec![(k1.to_vec(), v1.to_vec()), (k2.to_vec(), v2.to_vec()), (k3.to_vec(), v3.to_vec())];
 
     let mut iter = db.iter();
 
@@ -102,9 +101,8 @@ pub fn test_iterator() {
     assert_eq!(iter.collect::<Vec<_>>(), expected2);
 
     iter.seek(SeekKey::Key(k2));
-    let expected = vec![(k2.to_vec(), v2.to_vec()),
-                        (k3.to_vec(), v3.to_vec()),
-                        (k4.to_vec(), v4.to_vec())];
+    let expected =
+        vec![(k2.to_vec(), v2.to_vec()), (k3.to_vec(), v3.to_vec()), (k4.to_vec(), v4.to_vec())];
     assert_eq!(iter.collect::<Vec<_>>(), expected);
 
     iter.seek(SeekKey::Key(k2));

tests/test_slice_transform.rs

@@ -58,10 +58,8 @@ fn test_slice_transform() {
 
     let mut it = db.iter();
 
-    let invalid_seeks = vec![b"key_".to_vec(),
-                             b"key_0".to_vec(),
-                             b"key_030".to_vec(),
-                             b"key_03000".to_vec()];
+    let invalid_seeks =
+        vec![b"key_".to_vec(), b"key_0".to_vec(), b"key_030".to_vec(), b"key_03000".to_vec()];
 
     for key in invalid_seeks {
         it.seek(SeekKey::Key(&key));

travis-build/Makefile

+prepare-rustfmt:
+	curl -L https://github.com/tennix/rustfmt/releases/download/v0.6/rustfmt-${RUSTFMT_VERSION}-linux-amd64.tar.gz -o rustfmt-${RUSTFMT_VERSION}-linux-amd64.tar.gz && \
+	mkdir -p ${HOME}/.cargo/bin && tar xzf rustfmt-${RUSTFMT_VERSION}-linux-amd64.tar.gz -C ${HOME}/.cargo/bin --strip-components=1