Rollup merge of rust-lang#88278 - ehuss:update-cargo, r=ehuss

Update cargo 16 commits in e96bdb0c3d0a418e7fcd7fbd69be08abf830b4bc..9b81660b79832f92512edd4c29059a9ff88fcb6c 2021-08-17 22:58:47 +0000 to 2021-08-23 20:04:47 +0000 - Fix panic with build-std of a proc-macro. (rust-lang/cargo#9834) - Fix typos “a”→“an” (rust-lang/cargo#9821) - Fix typo in git-authentication.md (rust-lang/cargo#9832) - Add some debug logging for `cargo fix` (rust-lang/cargo#9831) - Add documentation about third-party registries. (rust-lang/cargo#9830) - unset the FIX_ENV when executing the real rustc (rust-lang/cargo#9818) - Allow crate download by checksum (rust-lang/cargo#9801) - Emit warning for migrating to unstable edition in stable channel (rust-lang/cargo#9792) - Warning for no lib dependencies (rust-lang/cargo#9771) - Temporarily disable extern-html-root-url test. (rust-lang/cargo#9824) - Move `tmp` test directory. (rust-lang/cargo#9814) - Fix test incorrectly validating CARGO_PKG_LICENSE_FILE. (rust-lang/cargo#9813) - Implement `[future-incompat-report]` config section (rust-lang/cargo#9774) - Bump curl. (rust-lang/cargo#9809) - Determine packages to install prior to installing (rust-lang/cargo#9793) - Show feature resolver differences for dev-dependencies. (rust-lang/cargo#9803)
Dylan-DPC-zz · Aug 26, 2021 · 76db2ab · 76db2ab
2 parents 246b0cd + 07d3729
commit 76db2ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -871,9 +871,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.44+curl-7.77.0"
+version = "0.4.45+curl-7.78.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1"
+checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb"
 dependencies = [
  "cc",
  "libc",

diff --git a/src/tools/cargo b/src/tools/cargo
+2 −2		Cargo.toml
+23 −7		src/cargo/core/compiler/job_queue.rs
+1 −1		src/cargo/core/compiler/layout.rs
+9 −4		src/cargo/core/compiler/unit_dependencies.rs
+79 −23		src/cargo/core/package.rs
+1 −1		src/cargo/core/resolver/conflict_cache.rs
+2 −2		src/cargo/core/resolver/mod.rs
+1 −1		src/cargo/core/resolver/types.rs
+1 −1		src/cargo/core/source/source_id.rs
+530 −445		src/cargo/ops/cargo_install.rs
+89 −45		src/cargo/ops/fix.rs
+18 −0		src/cargo/ops/resolve.rs
+1 −1		src/cargo/ops/tree/mod.rs
+1 −1		src/cargo/sources/git/utils.rs
+1 −1		src/cargo/sources/registry/index.rs
+3 −1		src/cargo/sources/registry/mod.rs
+6 −4		src/cargo/sources/registry/remote.rs
+41 −3		src/cargo/util/config/mod.rs
+5 −10		src/cargo/util/diagnostic_server.rs
+1 −0		src/cargo/util/toml/mod.rs
+1 −1		src/doc/src/appendix/git-authentication.md
+0 −1		src/doc/src/reference/environment-variables.md
+4 −3		src/doc/src/reference/registries.md
+12 −0		src/doc/src/reference/unstable.md
+6 −2		tests/testsuite/build.rs
+1 −1		tests/testsuite/config.rs
+1 −1		tests/testsuite/features_namespaced.rs
+76 −7		tests/testsuite/fix.rs
+35 −2		tests/testsuite/future_incompat_report.rs
+6 −6		tests/testsuite/install.rs
+6 −6		tests/testsuite/install_upgrade.rs
+190 −0		tests/testsuite/run.rs
+2 −0		tests/testsuite/rustdoc_extern_html.rs
+28 −0		tests/testsuite/standard_lib.rs
+1 −1		tests/testsuite/weak_dep_features.rs