Skip to content

Commit

Permalink
Rollup merge of rust-lang#41552 - jessicah:updated-num-cpus-dep, r=al…
Browse files Browse the repository at this point in the history
…excrichton

Update num_cpus dependency to 1.x (1.4.0)
  • Loading branch information
Ariel Ben-Yehuda committed Apr 26, 2017
2 parents c2bd3d3 + 85c2ff1 commit 708bfa7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test = false
build_helper = { path = "../build_helper" }
cmake = "0.1.17"
filetime = "0.1"
num_cpus = "0.2"
num_cpus = "1.0"
toml = "0.1"
getopts = "0.2"
rustc-serialize = "0.3"
Expand Down

0 comments on commit 708bfa7

Please sign in to comment.