From 380dd7d47b574697fe87ef00ad5ffcbb6651c501 Mon Sep 17 00:00:00 2001
From: Thomas de Zeeuw <thomasdezeeuw@gmail.com>
Date: Thu, 15 Nov 2018 16:41:06 +0100
Subject: [PATCH 1/3] Add rc::Weak.ptr_eq
---
src/liballoc/rc.rs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 705345ce963bb..064b3180d4c20 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -1260,6 +1260,52 @@ impl<T: ?Sized> Weak<T> {
Some(unsafe { self.ptr.as_ref() })
}
}
+
+ /// Returns true if the two `Weak`s point to the same value (not just values
+ /// that compare as equal).
+ ///
+ /// # Notes
+ ///
+ /// Since this compares pointers it means that `Weak::new()` will equal each
+ /// other, even though they don't point to any value.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(weak_ptr_eq)]
+ /// use std::rc::{Rc, Weak};
+ ///
+ /// let first_rc = Rc::new(5);
+ /// let first = Rc::downgrade(&first_rc);
+ /// let second = Rc::downgrade(&first_rc);
+ ///
+ /// assert!(Weak::ptr_eq(&first, &second));
+ ///
+ /// let third_rc = Rc::new(5);
+ /// let third = Rc::downgrade(&third_rc);
+ ///
+ /// assert!(!Weak::ptr_eq(&first, &third));
+ /// ```
+ ///
+ /// Comparing `Weak::new`.
+ ///
+ /// ```
+ /// #![feature(weak_ptr_eq)]
+ /// use std::rc::{Rc, Weak};
+ ///
+ /// let first = Weak::new();
+ /// let second = Weak::new();
+ /// assert!(Weak::ptr_eq(&first, &second));
+ ///
+ /// let third_rc = Rc::new(());
+ /// let third = Rc::downgrade(&third_rc);
+ /// assert!(!Weak::ptr_eq(&first, &third));
+ /// ```
+ #[inline]
+ #[unstable(feature = "weak_ptr_eq", issue = "55981")]
+ pub fn ptr_eq(this: &Self, other: &Self) -> bool {
+ this.ptr.as_ptr() == other.ptr.as_ptr()
+ }
}
#[stable(feature = "rc_weak", since = "1.4.0")]
From d4b41fa0313ace66d5f4e5d4a6201cd3aa81b87d Mon Sep 17 00:00:00 2001
From: Thomas de Zeeuw <thomasdezeeuw@gmail.com>
Date: Thu, 15 Nov 2018 20:24:02 +0100
Subject: [PATCH 2/3] Add sync::Weak::ptr_eq
---
src/liballoc/sync.rs | 47 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs
index 4f4031e3c4e32..0a397f79103db 100644
--- a/src/liballoc/sync.rs
+++ b/src/liballoc/sync.rs
@@ -1130,6 +1130,53 @@ impl<T: ?Sized> Weak<T> {
Some(unsafe { self.ptr.as_ref() })
}
}
+
+ /// Returns true if the two `Weak`s point to the same value (not just values
+ /// that compare as equal).
+ ///
+ /// # Notes
+ ///
+ /// Since this compares pointers it means that `Weak::new()` will equal each
+ /// other, even though they don't point to any value.
+ ///
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// #![feature(weak_ptr_eq)]
+ /// use std::sync::{Arc, Weak};
+ ///
+ /// let first_rc = Arc::new(5);
+ /// let first = Arc::downgrade(&first_rc);
+ /// let second = Arc::downgrade(&first_rc);
+ ///
+ /// assert!(Weak::ptr_eq(&first, &second));
+ ///
+ /// let third_rc = Arc::new(5);
+ /// let third = Arc::downgrade(&third_rc);
+ ///
+ /// assert!(!Weak::ptr_eq(&first, &third));
+ /// ```
+ ///
+ /// Comparing `Weak::new`.
+ ///
+ /// ```
+ /// #![feature(weak_ptr_eq)]
+ /// use std::sync::{Arc, Weak};
+ ///
+ /// let first = Weak::new();
+ /// let second = Weak::new();
+ /// assert!(Weak::ptr_eq(&first, &second));
+ ///
+ /// let third_rc = Arc::new(());
+ /// let third = Arc::downgrade(&third_rc);
+ /// assert!(!Weak::ptr_eq(&first, &third));
+ /// ```
+ #[inline]
+ #[unstable(feature = "weak_ptr_eq", issue = "55981")]
+ pub fn ptr_eq(this: &Self, other: &Self) -> bool {
+ this.ptr.as_ptr() == other.ptr.as_ptr()
+ }
}
#[stable(feature = "arc_weak", since = "1.4.0")]
From 38e21f92f1c09a597788062045b1e1d8c879e4f2 Mon Sep 17 00:00:00 2001
From: Thomas de Zeeuw <thomasdezeeuw@gmail.com>
Date: Fri, 23 Nov 2018 12:26:13 +0100
Subject: [PATCH 3/3] Fix link in Weak::new
---
src/liballoc/rc.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 064b3180d4c20..d81b8a1974dca 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -1187,8 +1187,9 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<Weak<U>> for Weak<T> {}
impl<T> Weak<T> {
/// Constructs a new `Weak<T>`, without allocating any memory.
- /// Calling [`upgrade`][Weak::upgrade] on the return value always gives [`None`].
+ /// Calling [`upgrade`] on the return value always gives [`None`].
///
+ /// [`upgrade`]: #method.upgrade
/// [`None`]: ../../std/option/enum.Option.html
///
/// # Examples