diff options
| author | bors <bors@rust-lang.org> | 2020-07-03 07:09:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-03 07:09:45 +0000 |
| commit | f844ea1e561475e6023282ef167e76bc973773ef (patch) | |
| tree | 58b8c48818c320f1bd7d6e9ca6a5ecbea7bd1fec | |
| parent | cd1a46d644791c79433db934ad4e6131c577efcc (diff) | |
| parent | 90039953d41d080e1df7dc119a5e63c7b829e503 (diff) | |
| download | rust-f844ea1e561475e6023282ef167e76bc973773ef.tar.gz rust-f844ea1e561475e6023282ef167e76bc973773ef.zip | |
Auto merge of #73897 - ehuss:update-cargo, r=ehuss
Update cargo, rls ## cargo 14 commits in c26576f9adddd254b3dd63aecba176434290a9f6..fede83ccf973457de319ba6fa0e36ead454d2e20 2020-06-23 16:21:21 +0000 to 2020-07-02 21:51:34 +0000 - Fix overflow error on 32-bit. (rust-lang/cargo#8446) - Exclude the target directory from backups using CACHEDIR.TAG (rust-lang/cargo#8378) - CONTRIBUTING.md: Link to Zulip rather than Discord (rust-lang/cargo#8436) - Update built-in help for features (rust-lang/cargo#8433) - Update core-foundation requirement from 0.7.0 to 0.9.0 (rust-lang/cargo#8432) - Parse `# env-dep` directives in dep-info files (rust-lang/cargo#8421) - Move string interning to util (rust-lang/cargo#8419) - Expose built cdylib artifacts in the Compilation structure (rust-lang/cargo#8418) - Remove unused serde_derive dependency from the crates.io crate (rust-lang/cargo#8416) - Remove unused remove_dir_all dependency (rust-lang/cargo#8412) - Improve git error messages a bit (rust-lang/cargo#8409) - Improve the description of Config.home_path (rust-lang/cargo#8408) - Improve support for non-`master` main branches (rust-lang/cargo#8364) - Document that OUT_DIR in JSON messages is an absolute path (rust-lang/cargo#8403) ## rls 2020-06-19 15:36:00 +0200 to 2020-06-30 23:34:52 +0200 - Update cargo (rust-lang-nursery/rls#1686)
| -rw-r--r-- | Cargo.lock | 10 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| m--------- | src/tools/rls | 0 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 84ad4d485dc..cedf44be85b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -312,7 +312,6 @@ dependencies = [ "openssl", "percent-encoding 2.1.0", "pretty_env_logger", - "remove_dir_all", "rustc-workspace-hack", "rustfix", "same-file", @@ -655,9 +654,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb" dependencies = [ "core-foundation-sys", "libc", @@ -665,9 +664,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +checksum = "9a21fa21941700a3cd8fcb4091f361a6a712fac632f85d9f487cc892045d55c6" [[package]] name = "crates-io" @@ -677,7 +676,6 @@ dependencies = [ "curl", "percent-encoding 2.1.0", "serde", - "serde_derive", "serde_json", "url 2.1.0", ] diff --git a/src/tools/cargo b/src/tools/cargo -Subproject c26576f9adddd254b3dd63aecba176434290a9f +Subproject fede83ccf973457de319ba6fa0e36ead454d2e2 diff --git a/src/tools/rls b/src/tools/rls -Subproject fb46b914c11b06828680cb526e2abe9e1d69b86 +Subproject dd341d53075411cf0f71c5853c98facda35112e |