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/rls#1686)
rust-lang · Jul 3, 2020 · f844ea1 · f844ea1
2 parents cd1a46d + 9003995
commit f844ea1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git 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,19 +654,19 @@ 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",
 ]
 
 [[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
diff --git a/src/tools/rls b/src/tools/rls
+4 −4		CONTRIBUTING.md
+1 −2		Cargo.toml
+0 −1		crates/crates-io/Cargo.toml
+1 −1		src/bin/cargo/commands/install.rs
+1 −1		src/cargo/core/compiler/build_config.rs
+2 −1		src/cargo/core/compiler/build_context/mod.rs
+4 −0		src/cargo/core/compiler/compilation.rs
+2 −1		src/cargo/core/compiler/compile_kind.rs
+1 −1		src/cargo/core/compiler/context/compilation_files.rs
+6 −0		src/cargo/core/compiler/context/mod.rs
+303 −87		src/cargo/core/compiler/fingerprint.rs
+5 −33		src/cargo/core/compiler/layout.rs
+1 −1		src/cargo/core/compiler/lto.rs
+6 −4		src/cargo/core/compiler/mod.rs
+2 −2		src/cargo/core/compiler/output_depinfo.rs
+2 −1		src/cargo/core/compiler/unit.rs
+2 −1		src/cargo/core/compiler/unit_dependencies.rs
+2 −1		src/cargo/core/compiler/unit_graph.rs
+1 −1		src/cargo/core/dependency.rs
+1 −1		src/cargo/core/manifest.rs
+0 −2		src/cargo/core/mod.rs
+1 −1		src/cargo/core/package.rs
+1 −1		src/cargo/core/package_id.rs
+2 −2		src/cargo/core/package_id_spec.rs
+1 −1		src/cargo/core/profiles.rs
+2 −1		src/cargo/core/registry.rs
+1 −1		src/cargo/core/resolver/context.rs
+1 −1		src/cargo/core/resolver/dep_cache.rs
+1 −1		src/cargo/core/resolver/encode.rs
+2 −2		src/cargo/core/resolver/errors.rs
+2 −1		src/cargo/core/resolver/features.rs
+1 −1		src/cargo/core/resolver/resolve.rs
+1 −1		src/cargo/core/resolver/types.rs
+10 −7		src/cargo/core/source/source_id.rs
+1 −1		src/cargo/core/summary.rs
+2 −1		src/cargo/core/workspace.rs
+7 −1		src/cargo/lib.rs
+2 −1		src/cargo/ops/cargo_clean.rs
+2 −1		src/cargo/ops/cargo_output_metadata.rs
+2 −3		src/cargo/ops/tree/graph.rs
+1 −0		src/cargo/ops/vendor.rs
+1 −1		src/cargo/sources/config.rs
+1 −5		src/cargo/sources/git/source.rs
+70 −48		src/cargo/sources/git/utils.rs
+2 −1		src/cargo/sources/registry/index.rs
+2 −1		src/cargo/sources/registry/local.rs
+2 −1		src/cargo/sources/registry/mod.rs
+3 −2		src/cargo/sources/registry/remote.rs
+2 −2		src/cargo/util/command_prelude.rs
+1 −1		src/cargo/util/config/mod.rs
+1 −1		src/cargo/util/interning.rs
+1 −0		src/cargo/util/mod.rs
+3 −3		src/cargo/util/network.rs
+89 −0		src/cargo/util/paths.rs
+1 −1		src/cargo/util/rustc.rs
+4 −3		src/cargo/util/toml/mod.rs
+2 −2		src/doc/src/reference/external-tools.md
+1 −1		src/doc/src/reference/specifying-dependencies.md
+0 −1		tests/build-std/main.rs
+3 −0		tests/internal.rs
+2 −2		tests/testsuite/bad_config.rs
+73 −1		tests/testsuite/build.rs
+7 −7		tests/testsuite/cargo_features.rs
+3 −1		tests/testsuite/clean.rs
+2 −1		tests/testsuite/config.rs
+42 −20		tests/testsuite/dep_info.rs
+8 −9		tests/testsuite/directory.rs
+6 −6		tests/testsuite/features.rs
+2 −2		tests/testsuite/features2.rs
+107 −0		tests/testsuite/freshness.rs
+48 −0		tests/testsuite/git.rs
+80 −8		tests/testsuite/git_auth.rs
+1 −1		tests/testsuite/metabuild.rs
+2 −2		tests/testsuite/offline.rs
+9 −9		tests/testsuite/package.rs
+7 −7		tests/testsuite/patch.rs
+3 −2		tests/testsuite/profile_config.rs
+1 −1		tests/testsuite/profiles.rs
+2 −2		tests/testsuite/pub_priv.rs
+9 −9		tests/testsuite/registry.rs
+5 −5		tests/testsuite/replace.rs
+2 −2		tests/testsuite/required_features.rs
+1 −1		tests/testsuite/run.rs
+2 −2		tests/testsuite/vendor.rs
+30 −22		Cargo.lock
+1 −1		Cargo.toml
+2 −1		rls/src/build/cargo.rs