diff options
| author | bors <bors@rust-lang.org> | 2024-11-02 14:12:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-02 14:12:12 +0000 |
| commit | 07cbbdd69363da97075650e9be24b78af0bcdd23 (patch) | |
| tree | 42948eb7578316c7ee491b6f1cfc47326bce5e95 /library/std/src | |
| parent | 588a4203508ed7c76750c96b482641261630ed36 (diff) | |
| parent | c4024585a418a732d9ae13017373b4f8b84b3ab2 (diff) | |
| download | rust-07cbbdd69363da97075650e9be24b78af0bcdd23.tar.gz rust-07cbbdd69363da97075650e9be24b78af0bcdd23.zip | |
Auto merge of #132513 - matthiaskrgr:rollup-y98jvsl, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #132481 (rustdoc: skip stability inheritance for some item kinds) - #132482 (library: fix some stability annotations) - #132493 (Fix type reference in documents which was being confused with html tags.) - #132494 (make `download-rustc="if-unchanged"` default for library profile) - #132495 (Remove unintended link) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/pal/windows/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/thread_local/guard/windows.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 1de52eb7b21..d0dd991a933 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -481,7 +481,7 @@ pub mod prelude; #[stable(feature = "rust1", since = "1.0.0")] pub use core::any; -#[stable(feature = "core_array", since = "1.36.0")] +#[stable(feature = "core_array", since = "1.35.0")] pub use core::array; #[unstable(feature = "async_iterator", issue = "79024")] pub use core::async_iter; diff --git a/library/std/src/sys/pal/windows/mod.rs b/library/std/src/sys/pal/windows/mod.rs index a9886012e8e..aca69490d7a 100644 --- a/library/std/src/sys/pal/windows/mod.rs +++ b/library/std/src/sys/pal/windows/mod.rs @@ -38,7 +38,7 @@ cfg_if::cfg_if! { } } -/// Map a Result<T, WinError> to io::Result<T>. +/// Map a [`Result<T, WinError>`] to [`io::Result<T>`](crate::io::Result<T>). trait IoResult<T> { fn io_result(self) -> crate::io::Result<T>; } diff --git a/library/std/src/sys/thread_local/guard/windows.rs b/library/std/src/sys/thread_local/guard/windows.rs index 7ee8e695c75..1752b0e1208 100644 --- a/library/std/src/sys/thread_local/guard/windows.rs +++ b/library/std/src/sys/thread_local/guard/windows.rs @@ -26,7 +26,7 @@ //! This apparently translates to any callbacks in the ".CRT$XLB" section //! being run on certain events. //! -//! So after all that, we use the compiler's #[link_section] feature to place +//! So after all that, we use the compiler's `#[link_section]` feature to place //! a callback pointer into the magic section so it ends up being called. //! //! # What's up with this callback? |