From bfc6137aecc222a1995476af2ea467256b5d21a6 Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Tue, 24 Sep 2019 18:06:07 +0200 Subject: [PATCH 1/2] Remove with-clang feature in favor of using $CC Signed-off-by: Victor Porof --- .travis.yml | 13 ++++++------- Cargo.toml | 1 - lmdb-sys/Cargo.toml | 7 +++---- lmdb-sys/build.rs | 4 ---- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59a9886..b8945e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,13 +32,12 @@ before_script: script: - cargo +nightly-2019-09-11 fmt --all -- --check - - cargo +nightly-2019-09-11 clippy --all-features -- -D warnings -A clippy::match-ref-pats -A clippy::needless-lifetimes - - cargo build --features with-clang --verbose - - cargo build --features with-asan --verbose - - cargo build --features with-fuzzer --verbose - - cargo build --features with-fuzzer-no-link --verbose - - cargo build --features with-asan,with-fuzzer --verbose - - cargo build --features with-asan,with-fuzzer-no-link --verbose + - CC="clang" cargo +nightly-2019-09-11 clippy --all-features -- -D warnings -A clippy::match-ref-pats -A clippy::needless-lifetimes + - CC="clang" cargo build --features with-asan --verbose + - CC="clang" cargo build --features with-fuzzer --verbose + - CC="clang" cargo build --features with-fuzzer-no-link --verbose + - CC="clang" cargo build --features with-asan,with-fuzzer --verbose + - CC="clang" cargo build --features with-asan,with-fuzzer-no-link --verbose - cargo build --verbose - export RUST_BACKTRACE=1 - cargo test --all --verbose diff --git a/Cargo.toml b/Cargo.toml index 28326bd..218a0ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,6 @@ tempdir = "0.3" [features] default = [] -with-clang = ["lmdb-rkv-sys/with-clang"] with-asan = ["lmdb-rkv-sys/with-asan"] with-fuzzer = ["lmdb-rkv-sys/with-fuzzer"] with-fuzzer-no-link = ["lmdb-rkv-sys/with-fuzzer-no-link"] diff --git a/lmdb-sys/Cargo.toml b/lmdb-sys/Cargo.toml index a46fb78..6bcea83 100644 --- a/lmdb-sys/Cargo.toml +++ b/lmdb-sys/Cargo.toml @@ -33,10 +33,9 @@ bindgen = "0.51" [features] default = [] -with-clang = [] -with-asan = ["with-clang"] -with-fuzzer = ["with-clang"] -with-fuzzer-no-link = ["with-clang"] +with-asan = [] +with-fuzzer = [] +with-fuzzer-no-link = [] # These features configure the MDB_IDL_LOGN macro, which determines # the size of the free and dirty page lists (and thus the amount of memory diff --git a/lmdb-sys/build.rs b/lmdb-sys/build.rs index 75737fe..a6527d7 100644 --- a/lmdb-sys/build.rs +++ b/lmdb-sys/build.rs @@ -61,10 +61,6 @@ fn main() { .flag_if_supported("-Wbad-function-cast") .flag_if_supported("-Wuninitialized"); - if env::var("CARGO_FEATURE_WITH_CLANG").is_ok() { - builder.compiler("clang"); - } - if env::var("CARGO_FEATURE_WITH_ASAN").is_ok() { builder.flag("-fsanitize=address"); } From ab1d7117a7e1a2fdb4e6fe607ba567390226bc63 Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Tue, 24 Sep 2019 20:15:59 +0200 Subject: [PATCH 2/2] Temporarily work around CI failure on linux nightlies Signed-off-by: Victor Porof --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index b8945e7..4d9ab6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,11 @@ rust: - beta - nightly +matrix: + allow_failures: + - rust: nightly + fast_finish: true + before_script: # We install a known-to-have-rustfmt version of the nightly toolchain # in order to run the nightly version of rustfmt, which supports rules