Skip to content

Commit

Permalink
Merge #341
Browse files Browse the repository at this point in the history
341: Add minimal versions check to travis r=stjepang a=taiki-e

Related: #312, rust-lang/cargo#5657

Co-authored-by: Taiki Endo <te316e89@gmail.com>
  • Loading branch information
bors[bot] and taiki-e committed Mar 10, 2019
2 parents 73081c0 + 8c20ae9 commit 536b83d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ matrix:
script: ./ci/crossbeam-utils.sh

# Check for duplicate dependencies.
- rust: stable
- rust: nightly
name: "dependency tree check"
script: ./ci/dependencies.sh

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly"]
std = ["crossbeam-epoch/std", "crossbeam-utils/std"]

[dependencies]
cfg-if = "0.1"
cfg-if = "0.1.2"

[dependencies.crossbeam-channel]
version = "0.3.7"
Expand Down
5 changes: 5 additions & 0 deletions ci/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@ cargo tree
cargo tree --duplicate
cargo tree --duplicate || exit 1

# Check minimal versions.
cargo update -Zminimal-versions
cargo tree
cargo check --all --all-features --exclude benchmarks

exit 0
2 changes: 1 addition & 1 deletion crossbeam-channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ keywords = ["channel", "mpmc", "select", "golang", "message"]
categories = ["algorithms", "concurrency", "data-structures"]

[dependencies]
smallvec = "0.6.2"
smallvec = "0.6.9"

[dependencies.crossbeam-utils]
version = "0.6.5"
Expand Down
1 change: 1 addition & 0 deletions crossbeam-channel/benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "benchmarks"
version = "0.1.0"
publish = false

[dependencies]
atomicring = "1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-epoch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ std = ["crossbeam-utils/std", "lazy_static"]
sanitize = [] # Makes it more likely to trigger any potential data races.

[dependencies]
cfg-if = "0.1"
cfg-if = "0.1.2"
memoffset = "0.2"

[dependencies.arrayvec]
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-skiplist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly"]
std = ["crossbeam-epoch/std", "crossbeam-utils/std"]

[dependencies]
cfg-if = "0.1"
cfg-if = "0.1.2"

[dependencies.crossbeam-epoch]
version = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nightly = []
std = ["lazy_static"]

[dependencies]
cfg-if = "0.1"
cfg-if = "0.1.2"
lazy_static = { version = "1.1.0", optional = true }

[dev-dependencies]
Expand Down

0 comments on commit 536b83d

Please sign in to comment.