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_compaction_filter.rs

@@ -47,9 +47,9 @@ fn test_compaction_filter() {
     opts.set_compaction_filter("test",
                                false,
                                Box::new(Filter {
-                                            drop_called: drop_called.clone(),
-                                            filtered_kvs: filtered_kvs.clone(),
-                                        }))
+                                   drop_called: drop_called.clone(),
+                                   filtered_kvs: filtered_kvs.clone(),
+                               }))
         .unwrap();
     opts.create_if_missing(true);
     let db = DB::open(opts, path.path().to_str().unwrap()).unwrap();
@@ -77,9 +77,9 @@ fn test_compaction_filter() {
     opts.set_compaction_filter("test",
                                true,
                                Box::new(Filter {
-                                            drop_called: drop_called.clone(),
-                                            filtered_kvs: filtered_kvs.clone(),
-                                        }))
+                                   drop_called: drop_called.clone(),
+                                   filtered_kvs: filtered_kvs.clone(),
+                               }))
         .unwrap();
     assert!(drop_called.load(Ordering::Relaxed));
     drop_called.store(false, Ordering::Relaxed);

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_multithreaded.rs

@@ -29,27 +29,27 @@ pub fn test_multithreaded() {
 
     let db1 = db.clone();
     let j1 = thread::spawn(move || for _ in 1..N {
-                               db1.put(b"key", b"value1").unwrap();
-                           });
+        db1.put(b"key", b"value1").unwrap();
+    });
 
     let db2 = db.clone();
     let j2 = thread::spawn(move || for _ in 1..N {
-                               db2.put(b"key", b"value2").unwrap();
-                           });
+        db2.put(b"key", b"value2").unwrap();
+    });
 
     let db3 = db.clone();
     let j3 = thread::spawn(move || for _ in 1..N {
-                               match db3.get(b"key") {
-                                   Ok(Some(v)) => {
-                                       if &v[..] != b"value1" && &v[..] != b"value2" {
-                                           assert!(false);
-                                       }
-                                   }
-                                   _ => {
-            assert!(false);
+        match db3.get(b"key") {
+            Ok(Some(v)) => {
+                if &v[..] != b"value1" && &v[..] != b"value2" {
+                    assert!(false);
+                }
+            }
+            _ => {
+                assert!(false);
+            }
         }
-                               }
-                           });
+    });
 
     j1.join().unwrap();
     j2.join().unwrap();

tests/test_rocksdb_options.rs

@@ -66,7 +66,7 @@ fn test_enable_statistics() {
     opts.set_stats_dump_period_sec(60);
     assert!(opts.get_statistics().is_some());
     assert!(opts.get_statistics_histogram_string(HistogramType::DbSeekMicros)
-                .is_some());
+        .is_some());
     assert_eq!(opts.get_statistics_ticker_count(TickerType::BlockCacheMiss),
                0);
     assert_eq!(opts.get_and_reset_statistics_ticker_count(TickerType::BlockCacheMiss),
@@ -99,8 +99,8 @@ fn test_memtable_insert_hint_prefix_extractor() {
     opts.create_if_missing(true);
     opts.set_memtable_insert_hint_prefix_extractor("FixedPrefixTransform",
                                                    Box::new(FixedPrefixTransform {
-                                                                prefix_len: 2,
-                                                            }))
+                                                       prefix_len: 2,
+                                                   }))
         .unwrap();
     let db = DB::open(opts, path.path().to_str().unwrap()).unwrap();
     let wopts = WriteOptions::new();

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));

tests/test_statistics.rs

@@ -36,7 +36,7 @@ fn test_db_statistics() {
     assert!(db.get_and_reset_statistics_ticker_count(TickerType::BlockCacheHit) > 0);
     assert_eq!(db.get_statistics_ticker_count(TickerType::BlockCacheHit), 0);
     assert!(db.get_statistics_histogram_string(HistogramType::DbGetMicros)
-                .is_some());
+        .is_some());
     assert!(db.get_statistics_histogram(HistogramType::DbGetMicros)
-                .is_some());
+        .is_some());
 }

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