From 68f6a123df8c3e688642eb34919007a56d478773 Mon Sep 17 00:00:00 2001 From: Tyler Neely Date: Sat, 2 Sep 2017 10:21:05 +0200 Subject: [PATCH 1/2] bump rocksdb to 5.6.2, suppress unused-parameter warnings --- .travis.yml | 4 +--- librocksdb-sys/Cargo.toml | 2 +- librocksdb-sys/build.rs | 27 +++++++++++++++++---------- librocksdb-sys/rocksdb | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6d8d5f..e87f39d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,4 @@ script: - cargo test --manifest-path=librocksdb-sys/Cargo.toml - cargo test -cache: - directories: - - $HOME/.cache/ +cache: cargo diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index 4cb8d58..67d0460 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librocksdb-sys" -version = "5.6.1" +version = "5.6.2" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" description = "Native bindings to librocksdb" diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index 9b00556..2292b07 100644 --- a/librocksdb-sys/build.rs +++ b/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::>(); // 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::>(); @@ -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| { - match *file { - "port/port_posix.cc" | - "util/env_posix.cc" | - "util/io_posix.cc" => false, - _ => true, - } + .filter(|file| match *file { + "port/port_posix.cc" | + "util/env_posix.cc" | + "util/io_posix.cc" => false, + _ => true, }) .collect::>(); @@ -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); diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index 20d49e4..bbd65ab 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit 20d49e4b9bace859fcdb5c87b37db2cdb2c6013a +Subproject commit bbd65abcfc156a4777d10250601761691e2fcef3 From 3e37a44cc134cdfd4e0353a1facb1c99d106403c Mon Sep 17 00:00:00 2001 From: Tyler Neely Date: Sat, 2 Sep 2017 10:33:27 +0200 Subject: [PATCH 2/2] bump rocksdb to 5.6.2, suppress warnings causing travis to abort --- CHANGELOG.txt | 5 +++++ Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cfcae4b..db1c3aa 100644 --- a/CHANGELOG.txt +++ b/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) diff --git a/Cargo.toml b/Cargo.toml index dcd1b6c..77058ef 100644 --- a/Cargo.toml +++ b/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 ", "David Greenberg "] 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" }