Skip to content

Commit 2815173

Browse files
authored
Rollup merge of rust-lang#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 rust-lang/rfcs#3097 or an equivalent is merged). Fixes rust-lang#80504. Prevents rust-lang#83154 and rust-lang/rustup#2694 in future releases. cc ``@kinnison`` r? ``@jyn514``
2 parents c31d315 + 4d5b3bd commit 2815173

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

std/src/keyword_docs.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,11 @@ mod return_keyword {}
13101310
/// [Reference]: ../reference/items/associated-items.html#methods
13111311
mod self_keyword {}
13121312

1313-
#[doc(keyword = "Self")]
1313+
// FIXME: Once rustdoc can handle URL conflicts on case insensitive file systems, we can remove the
1314+
// three next lines and put back: `#[doc(keyword = "Self")]`.
1315+
#[doc(alias = "Self")]
1316+
#[allow(rustc::existing_doc_keyword)]
1317+
#[doc(keyword = "SelfTy")]
13141318
//
13151319
/// The implementing type within a [`trait`] or [`impl`] block, or the current type within a type
13161320
/// definition.

0 commit comments

Comments
 (0)