From 98a2dc52b17119525654cc245310bf5f17a0e26b Mon Sep 17 00:00:00 2001 From: bluss Date: Sat, 6 Feb 2016 19:48:20 +0100 Subject: [PATCH 1/3] nodrop: Update to use newer odds --- nodrop/Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nodrop/Cargo.toml b/nodrop/Cargo.toml index 8021198..4d2a329 100644 --- a/nodrop/Cargo.toml +++ b/nodrop/Cargo.toml @@ -16,7 +16,7 @@ default = ["std"] # Default, Rust 1.6+ # Use libstd -std = [] +std = ["odds/std"] # Optional, nightly channel # Use no drop flag. See API doc for more info. @@ -27,4 +27,5 @@ no_drop_flag = [] use_needs_drop = [] [dependencies.odds] -version = "0.2" +version = "0.2.12" +default-features = false From e7ce808b37278200682aa4fba49e67030090183d Mon Sep 17 00:00:00 2001 From: bluss Date: Sat, 6 Feb 2016 19:49:27 +0100 Subject: [PATCH 2/3] Bump nodrop to 0.1.6 and no_std enable --- .travis.yml | 16 ++++++++++------ README.rst | 4 ++++ nodrop/Cargo.toml | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1722b5..776167a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,11 @@ matrix: include: - rust: 1.2.0 - rust: stable + env: + - NODEFAULT=1 - rust: beta - rust: nightly + - NODEFAULT=1 - rust: nightly env: - NODROP_FEATURES='no_drop_flag use_needs_drop' @@ -14,10 +17,11 @@ branches: - master script: - | - [ -z "$NODROP_FEATURES" ] && cargo build --verbose --features "$FEATURES" - [ -z "$NODROP_FEATURES" ] && cargo test --verbose --features "$FEATURES" - [ -z "$NODROP_FEATURES" ] && cargo test --release --verbose --features "$FEATURES" - [ -z "$NODROP_FEATURES" ] && cargo bench --verbose --features "$FEATURES" -- --test - [ -z "$NODROP_FEATURES" ] && cargo doc --verbose --features "$FEATURES" - cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" + ([ -z "$NODROP_FEATURES" ] && cargo build --verbose --features "$FEATURES") && + ([ -z "$NODROP_FEATURES" ] && cargo test --verbose --features "$FEATURES") && + ([ -z "$NODROP_FEATURES" ] && cargo test --release --verbose --features "$FEATURES") && + ([ -z "$NODROP_FEATURES" ] && cargo bench --verbose --features "$FEATURES" -- --test) && + ([ -z "$NODROP_FEATURES" ] && cargo doc --verbose --features "$FEATURES") && + ([ "$NODEFAULT" = 1 ] && cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) && + cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" && cargo bench --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" -- --test diff --git a/README.rst b/README.rst index ec99d46..23b1d6d 100644 --- a/README.rst +++ b/README.rst @@ -57,6 +57,10 @@ Recent Changes (arrayvec) Recent Changes (nodrop) ----------------------- +- 0.1.6 + + - Add feature std, which you can opt out of to use ``no_std``. + - 0.1.5 - Added crate feature ``use_needs_drop`` which is a nightly-only diff --git a/nodrop/Cargo.toml b/nodrop/Cargo.toml index 4d2a329..fe9890a 100644 --- a/nodrop/Cargo.toml +++ b/nodrop/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nodrop" -version = "0.1.5" +version = "0.1.6" authors = ["bluss"] license = "MIT/Apache-2.0" @@ -9,12 +9,12 @@ description = "A wrapper type to inhibit drop (destructor)." documentation = "http://bluss.github.io/arrayvec/doc/nodrop" repository = "https://github.com/bluss/arrayvec" -keywords = ["container", "drop"] +keywords = ["container", "drop", "no_std"] [features] default = ["std"] -# Default, Rust 1.6+ +# Default, requires Rust 1.6+ to disable # Use libstd std = ["odds/std"] From cd7f653ed1ebabb2bfda7f262d7388562444c9bd Mon Sep 17 00:00:00 2001 From: bluss Date: Sat, 6 Feb 2016 19:54:03 +0100 Subject: [PATCH 3/3] Fix shell in .travis --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 776167a..01ba9f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ matrix: - NODEFAULT=1 - rust: beta - rust: nightly + env: - NODEFAULT=1 - rust: nightly env: @@ -17,11 +18,11 @@ branches: - master script: - | - ([ -z "$NODROP_FEATURES" ] && cargo build --verbose --features "$FEATURES") && - ([ -z "$NODROP_FEATURES" ] && cargo test --verbose --features "$FEATURES") && - ([ -z "$NODROP_FEATURES" ] && cargo test --release --verbose --features "$FEATURES") && - ([ -z "$NODROP_FEATURES" ] && cargo bench --verbose --features "$FEATURES" -- --test) && - ([ -z "$NODROP_FEATURES" ] && cargo doc --verbose --features "$FEATURES") && - ([ "$NODEFAULT" = 1 ] && cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) && + ([ ! -z "$NODROP_FEATURES" ] || cargo build --verbose --features "$FEATURES") && + ([ ! -z "$NODROP_FEATURES" ] || cargo test --verbose --features "$FEATURES") && + ([ ! -z "$NODROP_FEATURES" ] || cargo test --release --verbose --features "$FEATURES") && + ([ ! -z "$NODROP_FEATURES" ] || cargo bench --verbose --features "$FEATURES" -- --test) && + ([ ! -z "$NODROP_FEATURES" ] || cargo doc --verbose --features "$FEATURES") && + ([ "$NODEFAULT" != 1 ] || cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) && cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" && cargo bench --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" -- --test