Skip to content

Commit 783139b

Browse files
committed
Auto merge of #72596 - ehuss:update-cargo, r=ehuss
Update cargo 7 commits in 500b2bd01c958f5a33b6aa3f080bea015877b83c..9fcb8c1d20c17f51054f7aa4e08ff28d381fe096 2020-05-18 17:12:54 +0000 to 2020-05-25 16:25:36 +0000 - Bump to semver 0.10 for `VersionReq::is_exact` (rust-lang/cargo#8279) - Fix panic with `cargo tree --target=all -Zfeatures=all` (rust-lang/cargo#8269) - Fix nightly tests with llvm-tools. (rust-lang/cargo#8272) - Provide better error messages for a bad `patch`. (rust-lang/cargo#8248) - Try installing exact versions before updating (rust-lang/cargo#8022) - Document unstable `strip` profile feature (rust-lang/cargo#8262) - Add option to strip binaries (rust-lang/cargo#8246)
2 parents e533559 + a0431e2 commit 783139b

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

Cargo.lock

+17-7
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ dependencies = [
337337
"rustc-workspace-hack",
338338
"rustfix",
339339
"same-file",
340-
"semver",
340+
"semver 0.10.0",
341341
"serde",
342342
"serde_ignored",
343343
"serde_json",
@@ -389,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
389389
checksum = "929766d993a2fde7a0ae962ee82429069cd7b68839cd9375b98efd719df65d3a"
390390
dependencies = [
391391
"failure",
392-
"semver",
392+
"semver 0.9.0",
393393
"serde",
394394
"serde_derive",
395395
"serde_json",
@@ -401,7 +401,7 @@ version = "0.9.1"
401401
source = "registry+https://github.com/rust-lang/crates.io-index"
402402
checksum = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202"
403403
dependencies = [
404-
"semver",
404+
"semver 0.9.0",
405405
"serde",
406406
"serde_derive",
407407
"serde_json",
@@ -540,7 +540,7 @@ dependencies = [
540540
"lazy_static 1.4.0",
541541
"rustc-workspace-hack",
542542
"rustc_tools_util 0.2.0",
543-
"semver",
543+
"semver 0.9.0",
544544
"serde",
545545
"tempfile",
546546
"tester",
@@ -561,7 +561,7 @@ dependencies = [
561561
"pulldown-cmark 0.7.1",
562562
"quine-mc_cluskey",
563563
"regex-syntax",
564-
"semver",
564+
"semver 0.9.0",
565565
"serde",
566566
"smallvec 1.4.0",
567567
"toml",
@@ -2090,7 +2090,7 @@ dependencies = [
20902090
"rayon",
20912091
"regex",
20922092
"reqwest",
2093-
"semver",
2093+
"semver 0.9.0",
20942094
"serde",
20952095
"serde_derive",
20962096
"serde_json",
@@ -4443,7 +4443,7 @@ version = "0.2.3"
44434443
source = "registry+https://github.com/rust-lang/crates.io-index"
44444444
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
44454445
dependencies = [
4446-
"semver",
4446+
"semver 0.9.0",
44474447
]
44484448

44494449
[[package]]
@@ -4604,6 +4604,16 @@ dependencies = [
46044604
"serde",
46054605
]
46064606

4607+
[[package]]
4608+
name = "semver"
4609+
version = "0.10.0"
4610+
source = "registry+https://github.com/rust-lang/crates.io-index"
4611+
checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
4612+
dependencies = [
4613+
"semver-parser",
4614+
"serde",
4615+
]
4616+
46074617
[[package]]
46084618
name = "semver-parser"
46094619
version = "0.7.0"

0 commit comments

Comments
 (0)