diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | bindgen-integration/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/main.rs | 2 | ||||
| -rw-r--r-- | tests/tests.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b3d84562..ba5ec867 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ rust: - stable env: - - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.8 BINDGEN_FEATURES=__testing_only_llvm_stable + - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.8 BINDGEN_FEATURES=testing_only_llvm_stable - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.9 BINDGEN_FEATURES= cache: @@ -66,7 +66,7 @@ version = "0.29" [features] assert_no_dangling_items = [] default = ["logging"] -__testing_only_llvm_stable = [] +testing_only_llvm_stable = [] logging = ["env_logger", "log"] static = [] # This feature only exists for CI -- don't use it! diff --git a/bindgen-integration/Cargo.toml b/bindgen-integration/Cargo.toml index 2aeec28a..3b1083d4 100644 --- a/bindgen-integration/Cargo.toml +++ b/bindgen-integration/Cargo.toml @@ -11,4 +11,4 @@ bindgen = { path = ".." } gcc = "0.3" [features] -__testing_only_llvm_stable = ["bindgen/__testing_only_llvm_stable"] +testing_only_llvm_stable = ["bindgen/testing_only_llvm_stable"] diff --git a/src/main.rs b/src/main.rs index 2b18f1ab..ea3da06d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,7 +25,7 @@ pub fn main() { let bind_args: Vec<_> = env::args().collect(); let version = clang_version(); - let expected_version = if cfg!(feature = "__testing_only_llvm_stable") { + let expected_version = if cfg!(feature = "testing_only_llvm_stable") { (3, 8) } else { (3, 9) diff --git a/tests/tests.rs b/tests/tests.rs index f1d229c5..6b69e0d4 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -84,7 +84,7 @@ fn create_bindgen_builder(header: &PathBuf) -> Result<Option<Builder>, Error> { .unwrap(); flags.extend(extra_flags.into_iter()); } else if line.contains("bindgen-unstable") && - cfg!(feature = "__testing_only_llvm_stable") { + cfg!(feature = "testing_only_llvm_stable") { return Ok(None); } else if line.contains("bindgen-osx-only") { let prepend_flags = ["--raw-line", "#![cfg(target_os=\"macos\")]"]; |