diff options
| author | bors <bors@rust-lang.org> | 2021-09-08 17:26:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-08 17:26:17 +0000 |
| commit | 47ae8deb8a35030bdc4e502b03400800864cc264 (patch) | |
| tree | d54ceba095ccad99db82466854201635442cea25 /library/std/src | |
| parent | c9db3e0fbc84d8409285698486375f080d361ef3 (diff) | |
| parent | 4cb751e1f4ea6b9925e9be8984851f01d0003e30 (diff) | |
| download | rust-47ae8deb8a35030bdc4e502b03400800864cc264.tar.gz rust-47ae8deb8a35030bdc4e502b03400800864cc264.zip | |
Auto merge of #88750 - jackh726:rollup-w57i9fp, r=jackh726
Rollup of 9 pull requests Successful merges: - #86263 (Rustdoc: Report Layout of enum variants) - #88541 (Add regression test for #74400) - #88553 (Improve diagnostics for unary plus operators (#88276)) - #88594 (More symbolic doc aliases) - #88648 (Correct “copies” to “moves” in `<Option<T> as From<T>>::from` doc, and other copyediting) - #88691 (Add a regression test for #88649) - #88694 (Drop 1.56 stabilizations from 1.55 release notes) - #88712 (Fix docs for `uX::checked_next_multiple_of`) - #88726 (Fix typo in `const_generics` replaced with `adt_const_params` note) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/keyword_docs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/primitive_docs.rs | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/library/std/src/keyword_docs.rs b/library/std/src/keyword_docs.rs index 749a441d182..3af941f59b6 100644 --- a/library/std/src/keyword_docs.rs +++ b/library/std/src/keyword_docs.rs @@ -119,7 +119,7 @@ mod break_keyword {} #[doc(keyword = "const")] // -/// Compile-time constants and compile-time evaluable functions. +/// Compile-time constants, compile-time evaluable functions, and raw pointers. /// /// ## Compile-time constants /// diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index b85489dabe9..1669c467b91 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -388,8 +388,11 @@ mod prim_char {} #[stable(feature = "rust1", since = "1.0.0")] mod prim_unit {} -#[doc(alias = "ptr")] #[doc(primitive = "pointer")] +#[doc(alias = "ptr")] +#[doc(alias = "*")] +#[doc(alias = "*const")] +#[doc(alias = "*mut")] // /// Raw, unsafe pointers, `*const T`, and `*mut T`. /// @@ -502,10 +505,10 @@ mod prim_unit {} #[stable(feature = "rust1", since = "1.0.0")] mod prim_pointer {} +#[doc(primitive = "array")] #[doc(alias = "[]")] #[doc(alias = "[T;N]")] // unfortunately, rustdoc doesn't have fuzzy search for aliases #[doc(alias = "[T; N]")] -#[doc(primitive = "array")] /// A fixed-size array, denoted `[T; N]`, for the element type, `T`, and the /// non-negative compile-time constant size, `N`. /// |