diff options
| author | bors <bors@rust-lang.org> | 2020-05-27 01:08:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-27 01:08:36 +0000 |
| commit | 783139bd8fc3b94fac9a1bf81bba2c506e8221b6 (patch) | |
| tree | 1e4e10b4241e17ad122920d5df4c6e0e8f568647 | |
| parent | e5335592e78354e33d798d20c04bcd677c1df62d (diff) | |
| parent | a0431e26feeab88a178724520b73949b497070d3 (diff) | |
| download | rust-783139bd8fc3b94fac9a1bf81bba2c506e8221b6.tar.gz rust-783139bd8fc3b94fac9a1bf81bba2c506e8221b6.zip | |
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)
| -rw-r--r-- | Cargo.lock | 24 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 17 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 19ecd2023c6..5c0e3162e0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,7 +337,7 @@ dependencies = [ "rustc-workspace-hack", "rustfix", "same-file", - "semver", + "semver 0.10.0", "serde", "serde_ignored", "serde_json", @@ -389,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "929766d993a2fde7a0ae962ee82429069cd7b68839cd9375b98efd719df65d3a" dependencies = [ "failure", - "semver", + "semver 0.9.0", "serde", "serde_derive", "serde_json", @@ -401,7 +401,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" dependencies = [ - "semver", + "semver 0.9.0", "serde", "serde_derive", "serde_json", @@ -540,7 +540,7 @@ dependencies = [ "lazy_static 1.4.0", "rustc-workspace-hack", "rustc_tools_util 0.2.0", - "semver", + "semver 0.9.0", "serde", "tempfile", "tester", @@ -561,7 +561,7 @@ dependencies = [ "pulldown-cmark 0.7.1", "quine-mc_cluskey", "regex-syntax", - "semver", + "semver 0.9.0", "serde", "smallvec 1.4.0", "toml", @@ -2090,7 +2090,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "semver", + "semver 0.9.0", "serde", "serde_derive", "serde_json", @@ -4443,7 +4443,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver", + "semver 0.9.0", ] [[package]] @@ -4605,6 +4605,16 @@ dependencies = [ ] [[package]] +name = "semver" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" +dependencies = [ + "semver-parser", + "serde", +] + +[[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 500b2bd01c958f5a33b6aa3f080bea015877b83 +Subproject 9fcb8c1d20c17f51054f7aa4e08ff28d381fe09 |
