diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-09 16:17:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 16:17:47 -0800 |
| commit | 0ae42f2c55305aab12b2f55346001b7d5539cb6f (patch) | |
| tree | d67aa466579c0f1afcedf3089789eda21352cfc0 | |
| parent | 0001606737c305eff1bb84162f95023a11bcc055 (diff) | |
| parent | 0db962b148e38cee515f1326ee9fcd4c97c143db (diff) | |
Auto merge of #501 - faineance:master, r=fitzgen
Rename llvm_stable feature and remove references from docs.
Fixes: https://github.com/servo/rust-bindgen/issues/409
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -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 |
6 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 4dd55c86..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=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: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ee1b4ac..cbaaf3c4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,7 @@ that you aren't forgetting to document types and functions. CI will catch it if you forget, but the turn around will be a lot slower ;) ``` -$ cargo build --features "llvm_stable _docs" +$ cargo build --features docs_ ``` ## Testing @@ -90,7 +90,7 @@ Run `cargo test` to compare generated Rust bindings to the expectations. ### Running All Tests ``` -$ cargo test [--features llvm_stable] +$ cargo test [--all-features] ``` ### Authoring New Tests @@ -66,7 +66,7 @@ version = "0.29" [features] assert_no_dangling_items = [] default = ["logging"] -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 9b8e341d..3b1083d4 100644 --- a/bindgen-integration/Cargo.toml +++ b/bindgen-integration/Cargo.toml @@ -11,4 +11,4 @@ bindgen = { path = ".." } gcc = "0.3" [features] -llvm_stable = ["bindgen/llvm_stable"] +testing_only_llvm_stable = ["bindgen/testing_only_llvm_stable"] diff --git a/src/main.rs b/src/main.rs index fc1ef8e2..df596e0b 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 = "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 ab1c00c3..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 = "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\")]"]; |