Merge branch 'master' of https://github.com/spacejam/rust-rocksdb

CHANGELOG.txt

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.8.2 (2017-12-28
+~~~~~~~~~~~~~~~~~~~~
+ * Bump rocksdb to 5.7.1 (jquesnelle)
+
 0.8.1 (2017-09-08)
 ~~~~~~~~~~~~~~~~~~~~
  * Added list_cf (jeizsm)

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rocksdb"
 description = "Rust wrapper for Facebook's RocksDB embeddable database"
-version = "0.8.1"
+version = "0.8.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.2" }
+librocksdb-sys = { path = "librocksdb-sys", version = "5.7.1" }

LICENSE

@@ -187,7 +187,10 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2015 Tyler Neely
+   Copyright 2016 Tyler Neely
+   Copyright 2017 Tyler Neely
+   Copyright 2018 Tyler Neely
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

librocksdb-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "librocksdb-sys"
-version = "5.6.2"
+version = "5.7.1"
 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

@@ -94,8 +94,8 @@ fn build_rocksdb() {
             .cloned()
             .filter(|file| match *file {
                 "port/port_posix.cc" |
-                "util/env_posix.cc" |
-                "util/io_posix.cc" => false,
+                "env/env_posix.cc" |
+                "env/io_posix.cc" => false,
                 _ => true,
             })
             .collect::<Vec<&'static str>>();
@@ -112,11 +112,10 @@ fn build_rocksdb() {
         config.flag("-EHsc");
     } else {
         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;

librocksdb-sys/rocksdb

@@ -1 +1 @@
-Subproject commit bbd65abcfc156a4777d10250601761691e2fcef3
+Subproject commit acf935e40f9d6f4c3d13c7d310def7064c1f1c95