Skip to content

Commit c27f756

Browse files
committed
Auto merge of #65388 - Centril:rollup-rhg0dvs, r=Centril
Rollup of 10 pull requests Successful merges: - #65214 (Split non-CAS atomic support off into target_has_atomic_load_store) - #65246 (vxWorks: implement get_path() and get_mode() for File fmt::Debug) - #65312 (improve performance of signed saturating_mul) - #65336 (Fix typo in task::Waker) - #65346 (nounwind tests and cleanup) - #65347 (Fix #[unwind(abort)] with Rust ABI) - #65366 (Implement Error::source on IntoStringError + Remove superfluous cause impls) - #65369 (Don't discard value names when using address or memory sanitizer) - #65370 (Add `dyn` to `Any` documentation) - #65373 (Fix typo in docs for `Rc`) Failed merges: r? @ghost
2 parents aa2ae56 + 92b36ce commit c27f756

File tree

24 files changed

+269
-199
lines changed

24 files changed

+269
-199
lines changed

src/liballoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ mod boxed {
153153
#[cfg(test)]
154154
mod tests;
155155
pub mod collections;
156-
#[cfg(all(target_has_atomic = "ptr", target_has_atomic = "cas"))]
156+
#[cfg(target_has_atomic = "ptr")]
157157
pub mod sync;
158158
pub mod rc;
159159
pub mod raw_vec;

src/liballoc/rc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ impl<T: Clone> Rc<T> {
773773
/// referred to as clone-on-write.
774774
///
775775
/// If there are no other `Rc` pointers to this value, then [`Weak`]
776-
/// pointers to this value will be dissassociated.
776+
/// pointers to this value will be disassociated.
777777
///
778778
/// See also [`get_mut`], which will fail rather than cloning.
779779
///
@@ -799,7 +799,7 @@ impl<T: Clone> Rc<T> {
799799
/// assert_eq!(*other_data, 12);
800800
/// ```
801801
///
802-
/// [`Weak`] pointers will be dissassociated:
802+
/// [`Weak`] pointers will be disassociated:
803803
///
804804
/// ```
805805
/// use std::rc::Rc;

src/libcore/any.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
//! of any `'static` type through runtime reflection.
33
//!
44
//! `Any` itself can be used to get a `TypeId`, and has more features when used
5-
//! as a trait object. As `&Any` (a borrowed trait object), it has the `is` and
6-
//! `downcast_ref` methods, to test if the contained value is of a given type,
7-
//! and to get a reference to the inner value as a type. As `&mut Any`, there
5+
//! as a trait object. As `&dyn Any` (a borrowed trait object), it has the `is`
6+
//! and `downcast_ref` methods, to test if the contained value is of a given type,
7+
//! and to get a reference to the inner value as a type. As `&mut dyn Any`, there
88
//! is also the `downcast_mut` method, for getting a mutable reference to the
9-
//! inner value. `Box<Any>` adds the `downcast` method, which attempts to
9+
//! inner value. `Box<dyn Any>` adds the `downcast` method, which attempts to
1010
//! convert to a `Box<T>`. See the [`Box`] documentation for the full details.
1111
//!
12-
//! Note that &Any is limited to testing whether a value is of a specified
12+
//! Note that `&dyn Any` is limited to testing whether a value is of a specified
1313
//! concrete type, and cannot be used to test whether a type implements a trait.
1414
//!
1515
//! [`Box`]: ../../std/boxed/struct.Box.html

src/libcore/num/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ $EndFeature, "
10581058
#[inline]
10591059
pub fn saturating_mul(self, rhs: Self) -> Self {
10601060
self.checked_mul(rhs).unwrap_or_else(|| {
1061-
if (self < 0 && rhs < 0) || (self > 0 && rhs > 0) {
1061+
if (self < 0) == (rhs < 0) {
10621062
Self::max_value()
10631063
} else {
10641064
Self::min_value()

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy