Skip to content

Commit

Permalink
Auto merge of #403 - kbknapp:cargo-features, r=kbknapp
Browse files Browse the repository at this point in the history
fix: fixes cargo features to NOT require nightly with unstable features
  • Loading branch information
homu committed Jan 30, 2016
2 parents 7b287d7 + 998b0df commit 3067a12
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ before_script:
export PATH=$HOME/.local/bin:$PATH
script:
- |
cargo build --features yaml &&
cargo test --features yaml &&
cargo build --verbose --no-default-features &&
cargo build --verbose --features yaml &&
cargo test --verbose --features yaml &&
make -C clap-tests test &&
travis-cargo --only stable doc -- --features yaml &&
travis-cargo --only nightly build -- --features travis &&
travis-cargo --only nightly bench &&
cargo build --no-default-features
travis-cargo --only stable doc -- --features yaml
addons:
apt:
packages:
Expand All @@ -28,4 +29,5 @@ after_success:
travis-cargo --only stable coveralls --no-sudo -- --features yaml
env:
global:
secure: JLBlgHY6OEmhJ8woewNJHmuBokTNUv7/WvLkJGV8xk0t6bXBwSU0jNloXwlH7FiQTc4TccX0PumPDD4MrMgxIAVFPmmmlQOCmdpYP4tqZJ8xo189E5zk8lKF5OyaVYCs5SMmFC3cxCsKjfwGIexNu3ck5Uhwe9jI0tqgkgM3URA=
- TRAVIS_CARGO_NIGHTLY_FEATURE=travis
- secure: JLBlgHY6OEmhJ8woewNJHmuBokTNUv7/WvLkJGV8xk0t6bXBwSU0jNloXwlH7FiQTc4TccX0PumPDD4MrMgxIAVFPmmmlQOCmdpYP4tqZJ8xo189E5zk8lKF5OyaVYCs5SMmFC3cxCsKjfwGIexNu3ck5Uhwe9jI0tqgkgM3URA=
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<a name="v2.0.1"></a>
### v2.0.1 (2016-01-30)


#### Bug Fixes

* fixes cargo features to NOT require nightly with unstable features ([dcbcc60c](https://github.com/kbknapp/clap-rs/commit/dcbcc60c9ba17894be636472ea4b07a82d86a9db), closes [#402](https://github.com/kbknapp/clap-rs/issues/402))


<a name="v2.0.0"></a>
## v2.0.0 (2016-01-28)

Expand Down Expand Up @@ -72,6 +81,7 @@
* **There is now a priority of order to determine the name** - This is perhaps the biggest breaking change. See the documentation for full details. Prior to this change, the value name took precedence. **Ensure your args are using the proper names (i.e. typically the long or short and NOT the value name) throughout the code**
* `ArgMatches::values_of` returns an `Values` now which implements `Iterator` (should not break any code)
* `crate_version!` returns `&'static str` instead of `String`
* Using the `clap_app!` macro requires compiling with the `unstable` feature because the syntax could change slightly in the future


<a name="v1.5.5"></a>
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "clap"
version = "2.0.0"
version = "2.0.1"
authors = ["Kevin K. <[email protected]>"]
exclude = ["examples/*", "clap-tests/*", "tests/*", "benches/*", "*.png", "clap-perf/*"]
description = "A simple to use, efficient, and full featured Command Line Argument Parser"
Expand All @@ -26,8 +26,9 @@ color = ["ansi_term"]
yaml = ["yaml-rust"]
lints = ["clippy", "nightly"]
nightly = [] # for building with nightly and unstable features
unstable = ["lints", "nightly"] # for building with travis-cargo
unstable = [] # for building with unstable features on stable Rust
debug = [] # for building with debug messages
travis = ["lints", "nightly"] # for building with travis-cargo

[profile.release]
opt-level = 3
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ Below is a list of breaking changes between 1.x and 2.x and how you can change y
* **There is now a priority of order to determine the name** - This is perhaps the biggest breaking change. See the documentation for full details. Prior to this change, the value name took precedence. **Ensure your args are using the proper names (i.e. typically the long or short and NOT the value name) throughout the code**
* `ArgMatches::values_of` returns an `Values` now which implements `Iterator` (should not break any code)
* `crate_version!` returns `&'static str` instead of `String`
* Using the `clap_app!` macro requires compiling with the `unstable` feature because the syntax could change slightly in the future

For full details, see [CHANGELOG.md](https://github.com/kbknapp/clap-rs/blob/master/CHANGELOG.md)

Expand Down Expand Up @@ -602,6 +603,7 @@ As of 2.0.0 (From 1.x)
* **There is now a priority of order to determine the name** - This is perhaps the biggest breaking change. See the documentation for full details. Prior to this change, the value name took precedence. **Ensure your args are using the proper names (i.e. typically the long or short and NOT the value name) throughout the code**
* `ArgMatches::values_of` returns an `Values` now which implements `Iterator` (should not break any code)
* `crate_version!` returns `&'static str` instead of `String`
* Using the `clap_app!` macro requires compiling with the `unstable` feature because the syntax could change slightly in the future
### Deprecations
Expand Down

0 comments on commit 3067a12

Please sign in to comment.