diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-03-31 01:14:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 01:14:48 +0200 |
| commit | d51fc973e495a4661a434cd89edd748c8a0fe0dc (patch) | |
| tree | 429f826573d39bc61d6a1c7f559b1b4832998af6 | |
| parent | f1ad4bd97c2452337d955660afd1062689dea211 (diff) | |
| parent | f35e587db4039fc255c876e5568b5db407977411 (diff) | |
| download | rust-d51fc973e495a4661a434cd89edd748c8a0fe0dc.tar.gz rust-d51fc973e495a4661a434cd89edd748c8a0fe0dc.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 e64cbc18bf7..890fa132bea 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. |