Merge pull request #140 from spacejam/tyler_fix_build_warnings

fix build warnings, bump rocksdb to 5.6.2

.travis.yml

@@ -17,6 +17,4 @@ script:
   - cargo test --manifest-path=librocksdb-sys/Cargo.toml
   - cargo test
 
-cache:
+cache: cargo
-  directories:
-    - $HOME/.cache/

CHANGELOG.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.7.2 (2017-09-02)
+~~~~~~~~~~~~~~~~~~~~
+ * Bumped rocksdb to 5.6.2 (spacejam)
+
+
 0.7.1 (2017-08-29)
 ~~~~~~~~~~~~~~~~~~~~
  * Bumped rocksdb to 5.6.1 (vmx)

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rocksdb"
 description = "Rust wrapper for Facebook's RocksDB embeddable database"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"]
 license = "Apache-2.0"
 keywords = ["database", "embedded", "LSM-tree", "persistence"]
@@ -19,4 +19,4 @@ valgrind = []
 
 [dependencies]
 libc = "0.2"
-librocksdb-sys = { path = "librocksdb-sys", version = "5.6.1" }
+librocksdb-sys = { path = "librocksdb-sys", version = "5.6.2" }

librocksdb-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "librocksdb-sys"
-version = "5.6.1"
+version = "5.6.2"
 authors = ["Karl Hobley <karlhobley10@gmail.com>", "Arkadiy Paronyan <arkadiy@ethcore.io>"]
 license = "MIT/Apache-2.0/BSD-3-Clause"
 description = "Native bindings to librocksdb"

librocksdb-sys/build.rs

@@ -17,7 +17,10 @@ fn link(name: &str, bundled: bool) {
 
 fn fail_on_empty_directory(name: &str) {
     if fs::read_dir(name).unwrap().count() == 0 {
-        println!("The `{}` directory is empty, did you forget to pull the submodules?", name);
+        println!(
+            "The `{}` directory is empty, did you forget to pull the submodules?",
+            name
+        );
         println!("Try `git submodule update --init --recursive`");
         panic!();
     }
@@ -42,7 +45,8 @@ fn build_rocksdb() {
         .collect::<Vec<&'static str>>();
 
     // We have a pregenerated a version of build_version.cc in the local directory
-    lib_sources = lib_sources.iter()
+    lib_sources = lib_sources
+        .iter()
         .cloned()
         .filter(|file| *file != "util/build_version.cc")
         .collect::<Vec<&'static str>>();
@@ -70,15 +74,14 @@ fn build_rocksdb() {
         config.define("OS_WIN", Some("1"));
 
         // Remove POSIX-specific sources
-        lib_sources = lib_sources.iter()
+        lib_sources = lib_sources
+            .iter()
             .cloned()
-            .filter(|file| {
+            .filter(|file| match *file {
-                match *file {
+                "port/port_posix.cc" |
-                    "port/port_posix.cc" |
+                "util/env_posix.cc" |
-                    "util/env_posix.cc" |
+                "util/io_posix.cc" => false,
-                    "util/io_posix.cc" => false,
+                _ => true,
-                    _ => true,
-                }
             })
             .collect::<Vec<&'static str>>();
 
@@ -96,6 +99,10 @@ fn build_rocksdb() {
         config.flag("-std=c++11");
     }
 
+    // this was breaking the build on travis due to
+    // > 4mb of warnings emitted.
+    config.flag("-Wno-unused-parameter");
+
     for file in lib_sources {
         let file = "rocksdb/".to_string() + file;
         config.file(&file);

librocksdb-sys/rocksdb

@@ -1 +1 @@
-Subproject commit 20d49e4b9bace859fcdb5c87b37db2cdb2c6013a
+Subproject commit bbd65abcfc156a4777d10250601761691e2fcef3