Skip to content

Commit

Permalink
bump version of rayon to 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
haraldmaida committed Jun 3, 2018
1 parent 62f1d10 commit c4fd1c4
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 20 deletions.
7 changes: 6 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ root = true
[*]
charset = utf-8
end_of_line = lf
indent_style = space

[*.rs]
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

[*.yml]
indent_size = 2
insert_final_newline = false
trim_trailing_whitespace = false
36 changes: 23 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ env:
global:
- RUSTFLAGS="-C link-dead-code"

cache: cargo

dist: trusty

before_install:
- sudo apt-get update

Expand All @@ -27,17 +31,23 @@ addons:
- binutils-dev
- libiberty-dev

script:
- cargo build --all-features --verbose
- cargo test --all-features --verbose

after_success: |
wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
tar xzf master.tar.gz &&
cd kcov-master &&
mkdir build &&
cd build &&
cmake .. &&
make &&
make install DESTDIR=../../kcov-build &&
cd ../.. &&
rm -rf kcov-master &&
for file in target/debug/genevo-*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
bash <(curl -s https://codecov.io/bash) &&
echo "Uploaded code coverage"
if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
tar xzf master.tar.gz &&
cd kcov-master &&
mkdir build &&
cd build &&
cmake .. &&
make &&
make install DESTDIR=../../kcov-build &&
cd ../.. &&
rm -rf kcov-master &&
for file in target/debug/genevo-*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
bash <(curl -s https://codecov.io/bash) &&
echo "Uploaded code coverage"
fi
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "genevo"
version = "0.1.4-MASTER"
authors = ["Harald Maida"]
version = "0.1.4"
authors = ["haraldmaida"]
license = "MIT/Apache-2.0"
description = """
genevo provides building blocks to run simulations of optimization and search problems using
Expand All @@ -24,7 +24,7 @@ chrono = "0.4"
fixedbitset = "0.1"
log = "0.4"
rand = "0.3"
rayon = "0.9"
rayon = "1.0"
xorshift = "0.1"

[dev-dependencies]
Expand Down
7 changes: 4 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

version: '0.1.1.{build}'
version: '0.1.4.{build}'

os: Visual Studio 2015
image: Visual Studio 2017

environment:
matrix:
Expand Down Expand Up @@ -53,4 +53,5 @@ build: false
# directly or perform other testing commands. Rust will automatically be placed in the PATH
# environment variable.
test_script:
- cargo test --verbose %cargoflags%
- cargo build --all-features --verbose %cargoflags%
- cargo test --all-features --verbose %cargoflags%
1 change: 1 addition & 0 deletions src/types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
//! * `i16`
//! * `i32`
//! * `i64`
//! * `isize`
//! * `u8`
//! * `u16`
//! * `u32`
Expand Down

0 comments on commit c4fd1c4

Please sign in to comment.