From 6f3aa4b01566d606bc2d1096d33353daeed8ed3a Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 20 Apr 2021 20:39:58 -0700 Subject: [PATCH 1/3] [beta] Update cargo --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index d70308ef05239..69767412acbf7 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit d70308ef052397c7d16f881c2d973a8c5b4c23d9 +Subproject commit 69767412acbf7f64773427b1fb53e45296712c3c From 97ffd5433e461381671909777b0763b088634bc4 Mon Sep 17 00:00:00 2001 From: bors Date: Wed, 21 Apr 2021 17:07:45 +0000 Subject: [PATCH 2/3] Auto merge of #84394 - m-ou-se:upgrade-ci-dep-expat, r=Mark-Simulacrum Upgrade `expat` dependency in riscv64 to newer version. The old version was renamed to `expat-2.2.6-RENAMED-VULNERABLE-PLEASE-USE-2.3.0-INSTEAD`. :) r? `@Mark-Simulacrum` --- .../dist-riscv64-linux/riscv64-unknown-linux-gnu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dbb4be550dd70..7124ee3aeb53b 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}" From 9787d0c7805e49ce55381375a4223dab178e0367 Mon Sep 17 00:00:00 2001 From: Dylan DPC Date: Wed, 31 Mar 2021 01:14:48 +0200 Subject: [PATCH 3/3] Rollup merge of #83678 - GuillaumeGomez:hack-Self-keyword-conflict, r=jyn514 Fix Self keyword doc URL conflict on case insensitive file systems (until definitely fixed on rustdoc) This is just a hack to allow rustup to work on macOS and windows again to distribute std documentation (hopefully once https://github.com/rust-lang/rfcs/pull/3097 or an equivalent is merged). Fixes https://github.com/rust-lang/rust/issues/80504. Prevents https://github.com/rust-lang/rust/issues/83154 and https://github.com/rust-lang/rustup/issues/2694 in future releases. cc ``@kinnison`` r? ``@jyn514`` --- library/std/src/keyword_docs.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs index 383eaf2e3a206..46bfd834f81a2 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.