Auto merge of rust-lang#84382 - ehuss:update-beta-cargo, r=ehuss

[beta] Beta rollups - Upgrade expat dependency in riscv64 to newer version. rust-lang#84394 - Fix Self keyword doc URL conflict on case insensitive file systems (until definitely fixed on rustdoc) rust-lang#83678 - Cargo: - Backport "Don't give a hard error when the end-user specifies RUSTC_BOOTSTRAP=crate_name" (rust-lang/cargo#9385) - [beta] Revert rust-lang/cargo#9133, moving to git HEAD dependencies by default (rust-lang/cargo#9383)
rust-lang-ci · Apr 21, 2021 · b2df13e · b2df13e
2 parents 2157381 + 9787d0c
commit b2df13e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs
@@ -1310,7 +1310,11 @@ mod return_keyword {}
 /// [Reference]: ../reference/items/associated-items.html#methods
 mod self_keyword {}
 
-#[doc(keyword = "Self")]
+// FIXME: Once rustdoc can handle URL conflicts on case insensitive file systems, we can remove the
+// three next lines and put back: `#[doc(keyword = "Self")]`.
+#[doc(alias = "Self")]
+#[allow(rustc::existing_doc_keyword)]
+#[doc(keyword = "SelfTy")]
 //
 /// The implementing type within a [`trait`] or [`impl`] block, or the current type within a type
 /// definition.

diff --git a/src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config b/src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config
@@ -644,7 +644,7 @@ CT_EXPAT_PATCH_GLOBAL=y
 CT_EXPAT_PATCH_ORDER="global"
 CT_EXPAT_V_2_2=y
 # CT_EXPAT_NO_VERSIONS is not set
-CT_EXPAT_VERSION="2.2.6"
+CT_EXPAT_VERSION="2.3.0"
 CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}"
 CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

diff --git a/src/tools/cargo b/src/tools/cargo
+30 −13		src/cargo/core/compiler/custom_build.rs
+4 −0		src/cargo/core/package.rs
+48 −0		src/cargo/core/resolver/dep_cache.rs
+2 −1		src/cargo/core/resolver/mod.rs
+1 −1		src/cargo/core/resolver/resolve.rs
+74 −4		src/cargo/core/source/source_id.rs
+3 −29		src/cargo/ops/resolve.rs
+5 −3		src/cargo/sources/git/source.rs
+156 −11		src/cargo/sources/git/utils.rs
+1 −1		src/cargo/sources/registry/remote.rs
+53 −10		tests/testsuite/build_script_env.rs
+17 −7		tests/testsuite/git.rs
+0 −8		tests/testsuite/lockfile_compat.rs
+2 −1		tests/testsuite/update.rs