about summary refs log tree commit diff
path: root/library/core/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-09-22 01:41:03 +0000
committerbors <bors@rust-lang.org>2022-09-22 01:41:03 +0000
commit626b02a8f97a9e35a647aa18fcdb67cbcb3b09c8 (patch)
treee22193ef46205ca9429e757fcd508cbe7eb9dd2f /library/core/src
parent4a4fd12ebfd01d969a719e5c43c2e318441e827b (diff)
parent15b4788e36a5ca55380cc88483a9a20198a5a381 (diff)
downloadrust-626b02a8f97a9e35a647aa18fcdb67cbcb3b09c8.tar.gz
rust-626b02a8f97a9e35a647aa18fcdb67cbcb3b09c8.zip
Auto merge of #102121 - JohnTitor:rollup-3fb1wrt, r=JohnTitor
Rollup of 12 pull requests

Successful merges:

 - #101952 (Avoid panicking on missing fallback)
 - #102030 (Don't crate-locally reexport walk functions in tidy)
 - #102032 (Adding ignore fuchsia tests for signal interpretation cases)
 - #102033 (Adding needs-unwind to nicer-assert-messages compiler ui tests)
 - #102054 (Unify "all items" page's sidebar with other pages)
 - #102071 (Adding needs-unwind for tests testing memory size of Futures/Closures)
 - #102073 (Adding ignore fuchsia tests for execvp)
 - #102075 (rustdoc: remove no-op CSS `.content > .methods > .method`)
 - #102079 (Update books)
 - #102084 (Adding needs-unwind for test using panic::catch_unwind)
 - #102100 (Prevent usage of .stab elements to create scrollable areas in doc blocks)
 - #102102 (Add doc aliases on Sized trait)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src')
-rw-r--r--library/core/src/marker.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
index b8239ed88ac..40a7b696193 100644
--- a/library/core/src/marker.rs
+++ b/library/core/src/marker.rs
@@ -81,6 +81,7 @@ impl<T: ?Sized> !Send for *mut T {}
 /// ```
 ///
 /// [trait object]: ../../book/ch17-02-trait-objects.html
+#[doc(alias = "?", alias = "?Sized")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[lang = "sized"]
 #[rustc_on_unimplemented(