Auto merge of #88279 - ehuss:update-beta-cargo, r=ehuss

[beta] Update cargo 2 commits in 1f76a218bc7f326606dda811b58c42b7e1e21168..32da73ab19417aa89686e1d85c1440b72fdf877d 2021-07-29 22:22:25 +0000 to 2021-08-23 18:16:08 +0000 - [beta] Move `tmp` test directory. (rust-lang/cargo#9819) - [beta] Bump curl (rust-lang/cargo#9810)
rust-lang · Aug 27, 2021 · 2296b16 · 2296b16
2 parents bf16ca3 + d6ef4e7
commit 2296b16
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
+1 −1		src/cargo/core/compiler/layout.rs
+1 −0		src/cargo/util/toml/mod.rs
+0 −1		src/doc/src/reference/environment-variables.md
+1 −1		src/doc/src/reference/semver.md
+4 −1		tests/testsuite/build.rs
+3 −3		tests/testsuite/cross_compile.rs
+6 −6		tests/testsuite/plugins.rs
+3 −3		tests/testsuite/proc_macro.rs
+2 −0		tests/testsuite/rustdoc_extern_html.rs