diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-03-31 01:14:48 +0200 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2021-04-21 13:41:24 -0700 |
| commit | 9787d0c7805e49ce55381375a4223dab178e0367 (patch) | |
| tree | 62955602cd8a61cd567976e1a5b55a41a097671f | |
| parent | 97ffd5433e461381671909777b0763b088634bc4 (diff) | |
| download | rust-9787d0c7805e49ce55381375a4223dab178e0367.tar.gz rust-9787d0c7805e49ce55381375a4223dab178e0367.zip | |
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``
| -rw-r--r-- | library/std/src/keyword_docs.rs | 6 |
1 files changed, 5 insertions, 1 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. |