Skip to content

Commit

Permalink
fix/travis: fix feature build flags
Browse files Browse the repository at this point in the history
  • Loading branch information
hobofan committed Dec 9, 2015
1 parent 0912715 commit f9861a7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
20 changes: 9 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,23 @@ rust:
- stable
matrix:
allow_failures:
- rust: beta
- rust: stable
- rust: nightly
env: TRAVIS_CARGO_NIGHTLY_FEATURE=lint
env: FEATURES=lint
exclude:
- rust: beta
env: TRAVIS_CARGO_NIGHTLY_FEATURE=lint
env: FEATURES=lint
- rust: stable
env: TRAVIS_CARGO_NIGHTLY_FEATURE=lint
env: FEATURES=lint
before_script:
- |
pip install 'travis-cargo<0.2' --user &&
export PATH=$HOME/.local/bin:$PATH
script:
- |
travis-cargo build -- --no-default-features &&
travis-cargo test -- --no-default-features &&
travis-cargo bench -- --no-default-features &&
travis-cargo doc -- --no-default-features
travis-cargo build -- --no-default-features --features $FEATURES &&
travis-cargo test -- --no-default-features --features $FEATURES &&
travis-cargo bench -- --no-default-features --features $FEATURES &&
travis-cargo doc -- --no-default-features --features $FEATURES
addons:
apt:
packages:
Expand All @@ -44,5 +42,5 @@ env:
global:
- secure: iq9uF0iCndl7hnnUmtL9qdYaDvBvPGrImFtrDq1XtJQoNurXYO9OXyOyTIBGFIRkwfEt8Fk79cWaif6hktpammv/0uWrVzRQd8b6stOFRjOJ9fJ46ETQcNn3usr2YrRdTm7k01GXB1U5RSyYYiG63pcIkcui2NgOmnqZaCuQ4pJsHWQVGUbBey5vLTEC1zAdfYY4V9554yVW1V+eA9Atdnur8f9gUbkkG/XKhoKcpT3UtS6MD7MAPIH1Rnrf8GXIc1NAxzLD0zcKBo2o3yIbfGMm4RgRnmI6tRZBI0MgDoB8/1AGLZbBWoSaB5d7S8f/ghqzMu2AnM1HO26sTGYvy0kwt9DAmdBVcB82yFV4y4KMCr0R0Kz9XO3jukl42cmyPyYWAFQG8TO+/LjvPuj1PDSTvvvvit9QotCS+q9FE2aG5lag6W55GlMNPhR2JqLQtuCSaEgkDOmGQIDvZLkceekC2gC6/ryVcDNOUEYyUFrLpd20koDfuttth73tnYgcDIqWIoZ5nhQw1ciXfkSiP9/rOFKTZZXvO0KVgVi95Pwn4xjbBPOWQelIJtOzGRzehUaBnYZWKVFsyk7d7BVK9hWWv2DeOsbGc5Oz9X70ThAA/9d3E2vjVlJmwrijVSWnga/SJFhV5XgYaAO1vHe2tMDJGtGAT9B4ZWjuudNYPyg=
matrix:
- TRAVIS_CARGO_NIGHTLY_FEATURE=travis
- TRAVIS_CARGO_NIGHTLY_FEATURE=lint
- FEATURES=travis
- FEATURES=lint
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ cuda = []
opencl = []

dev = []
unstable = [] # for travis-cargo
travis = ["native"]
lint = ["clippy"]

Expand Down
4 changes: 1 addition & 3 deletions src/shared_memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
//!
//! ## Examples
//!
//! Create SharedMemory and fill it with some numbers:
//! Create SharedMemory:
//!
//! ```
//! #![feature(clone_from_slice)]
//! # extern crate collenchyma;
//! use collenchyma::framework::IFramework;
//! use collenchyma::frameworks::Native;
Expand All @@ -31,7 +30,6 @@
//! // fill memory with some numbers
//! let local_data = [0, 1, 2, 3, 4];
//! let data = shared_data.get_mut(&device).unwrap().as_mut_native().unwrap();
//! data.as_mut_slice().clone_from_slice(&local_data);
//! # }
//! ```
Expand Down

0 comments on commit f9861a7

Please sign in to comment.