diff --git a/.travis.yml b/.travis.yml index 286cf3b..dc3c5c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: rust -dist: xenial -sudo: false +dist: bionic os: - linux @@ -10,18 +9,9 @@ os: rust: - stable -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty - packages: - - g++ - - llvm-dev - - libclang-dev - - clang - -cache: cargo +jobs: + allow_failures: + - os: windows install: - rustup component add rustfmt diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index d0beb1b..c36b7b4 100644 --- a/librocksdb-sys/build.rs +++ b/librocksdb-sys/build.rs @@ -81,7 +81,7 @@ fn build_rocksdb() { let mut lib_sources = include_str!("rocksdb_lib_sources.txt") .trim() - .split("\n") + .split('\n') .map(str::trim) .collect::>(); @@ -205,11 +205,10 @@ fn build_lz4() { compiler.opt_level(3); - match env::var("TARGET").unwrap().as_str() { - "i686-pc-windows-gnu" => { - compiler.flag("-fno-tree-vectorize"); - } - _ => {} + let target = env::var("TARGET").unwrap(); + + if &target == "i686-pc-windows-gnu" { + compiler.flag("-fno-tree-vectorize"); } compiler.compile("liblz4.a");