diff options
| author | bors <bors@rust-lang.org> | 2021-04-21 20:58:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-21 20:58:16 +0000 |
| commit | b2df13e6c695f0dfd5446ab71b07c5cd92ae0361 (patch) | |
| tree | 62955602cd8a61cd567976e1a5b55a41a097671f | |
| parent | 215738137bcbef2c3637a5bd290ef612cffe6ba5 (diff) | |
| parent | 9787d0c7805e49ce55381375a4223dab178e0367 (diff) | |
Auto merge of #84382 - ehuss:update-beta-cargo, r=ehuss
[beta] Beta rollups
- Upgrade expat dependency in riscv64 to newer version. #84394
- Fix Self keyword doc URL conflict on case insensitive file systems (until definitely fixed on rustdoc) #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)
| -rw-r--r-- | library/std/src/keyword_docs.rs | 6 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config | 2 | ||||
| m--------- | src/tools/cargo | 0 |
3 files changed, 6 insertions, 2 deletions
diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs index 383eaf2e3a2..46bfd834f81 100644 --- 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 index dbb4be550dd..7124ee3aeb5 100644 --- 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 -Subproject d70308ef052397c7d16f881c2d973a8c5b4c23d +Subproject 69767412acbf7f64773427b1fb53e45296712c3 |