diff options
| author | bors <bors@rust-lang.org> | 2023-03-16 11:06:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-16 11:06:02 +0000 |
| commit | 7ac4b82ddd596a218cac8cd6b88a91b54fcdcf13 (patch) | |
| tree | 191fd952f333b9275766d48bab742a4208ec6ad4 /library/std/src | |
| parent | cd6c574af3886c41f34086d90df42c3da0144693 (diff) | |
| parent | a70e138ed89fe5464bb372410c8418058783b9cc (diff) | |
| download | rust-7ac4b82ddd596a218cac8cd6b88a91b54fcdcf13.tar.gz rust-7ac4b82ddd596a218cac8cd6b88a91b54fcdcf13.zip | |
Auto merge of #109206 - matthiaskrgr:rollup-oev8ax6, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #108875 (rustdoc: fix type search for `Option` combinators) - #108971 (error-msg: impl better suggestion for `E0532`) - #109139 (rustdoc: DocFS: Replace rayon with threadpool and enable it for all targets) - #109151 (Assert def-kind is correct for alias types) - #109158 (error-msg: expand suggestion for `unused_def` lint) - #109166 (make `define_opaque_types` fully explicit) - #109171 (Some cleanups in our normalization logic) - #109180 (Unequal → Not equal) - #109185 (rustdoc: remove `std::` from primitive intra-doc link tooltips) - #109192 (Mention UEFI target promotion in release notes for 1.67.0) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/primitive_docs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sync/remutex.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index 6f78811a186..e12a3e378a6 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -1110,7 +1110,7 @@ impl<T: Copy> Copy for (T,) { /// - [NaN (not a number)](#associatedconstant.NAN): this value results from /// calculations like `(-1.0).sqrt()`. NaN has some potentially unexpected /// behavior: -/// - It is unequal to any float, including itself! This is the reason `f32` +/// - It is not equal to any float, including itself! This is the reason `f32` /// doesn't implement the `Eq` trait. /// - It is also neither smaller nor greater than any float, making it /// impossible to sort by the default comparison operation, which is the diff --git a/library/std/src/sync/remutex.rs b/library/std/src/sync/remutex.rs index 4c054da6471..519ec2c32bd 100644 --- a/library/std/src/sync/remutex.rs +++ b/library/std/src/sync/remutex.rs @@ -35,7 +35,7 @@ use crate::sys::locks as sys; /// `owner` can be checked by other threads that want to see if they already /// hold the lock, so needs to be atomic. If it compares equal, we're on the /// same thread that holds the mutex and memory access can use relaxed ordering -/// since we're not dealing with multiple threads. If it compares unequal, +/// since we're not dealing with multiple threads. If it's not equal, /// synchronization is left to the mutex, making relaxed memory ordering for /// the `owner` field fine in all cases. pub struct ReentrantMutex<T> { |