mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Pin::set bounds regression

Browse Source
This commit is contained in:
Noa 2024-08-27 15:56:05 -05:00
parent c6db1ca3c9
commit 0d6c9152fa
No known key found for this signature in database
GPG Key ID: 7F9F7DB1768C59CF
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/core/src/pin.rs
View File

@ -1370,7 +1370,15 @@ pub fn as_ref(&self) -> Pin<&Ptr::Target> {
// SAFETY: see documentation on this function // SAFETY: see documentation on this function
unsafe { Pin::new_unchecked(&*self.__pointer) } unsafe { Pin::new_unchecked(&*self.__pointer) }
} }
}
// These methods being in a `Ptr: DerefMut` impl block concerns semver stability.
// Currently, calling e.g. `.set()` on a `Pin<&T>` sees that `Ptr: DerefMut`
// doesn't hold, and goes to check for a `.set()` method on `T`. But, if the
// `where Ptr: DerefMut` bound is moved to the method, rustc sees the impl block
// as a valid candidate, and doesn't go on to check other candidates when it
// sees that the bound on the method.
impl<Ptr: DerefMut> Pin<Ptr> {
/// Gets a mutable reference to the pinned value this `Pin<Ptr>` points to. /// Gets a mutable reference to the pinned value this `Pin<Ptr>` points to.
/// ///
/// This is a generic method to go from `&mut Pin<Pointer<T>>` to `Pin<&mut T>`. /// This is a generic method to go from `&mut Pin<Pointer<T>>` to `Pin<&mut T>`.
@ -1402,10 +1410,7 @@ pub fn as_ref(&self) -> Pin<&Ptr::Target> {
/// ``` /// ```
#[stable(feature = "pin", since = "1.33.0")] #[stable(feature = "pin", since = "1.33.0")]
#[inline(always)] #[inline(always)]
pub fn as_mut(&mut self) -> Pin<&mut Ptr::Target> pub fn as_mut(&mut self) -> Pin<&mut Ptr::Target> {
where
Ptr: DerefMut,
{
// SAFETY: see documentation on this function // SAFETY: see documentation on this function
unsafe { Pin::new_unchecked(&mut *self.__pointer) } unsafe { Pin::new_unchecked(&mut *self.__pointer) }
} }
@ -1420,10 +1425,7 @@ pub fn as_mut(&mut self) -> Pin<&mut Ptr::Target>
#[unstable(feature = "pin_deref_mut", issue = "86918")] #[unstable(feature = "pin_deref_mut", issue = "86918")]
#[must_use = "`self` will be dropped if the result is not used"] #[must_use = "`self` will be dropped if the result is not used"]
#[inline(always)] #[inline(always)]
pub fn as_deref_mut(self: Pin<&mut Pin<Ptr>>) -> Pin<&mut Ptr::Target> pub fn as_deref_mut(self: Pin<&mut Pin<Ptr>>) -> Pin<&mut Ptr::Target> {
where
Ptr: DerefMut,
{
// SAFETY: What we're asserting here is that going from // SAFETY: What we're asserting here is that going from
// //
// Pin<&mut Pin<Ptr>> // Pin<&mut Pin<Ptr>>
@ -1475,12 +1477,13 @@ pub fn as_deref_mut(self: Pin<&mut Pin<Ptr>>) -> Pin<&mut Ptr::Target>
#[inline(always)] #[inline(always)]
pub fn set(&mut self, value: Ptr::Target) pub fn set(&mut self, value: Ptr::Target)
where where
Ptr: DerefMut,
Ptr::Target: Sized, Ptr::Target: Sized,
{ {
*(self.__pointer) = value; *(self.__pointer) = value;
} }
}
impl<Ptr: Deref> Pin<Ptr> {
/// Unwraps this `Pin<Ptr>`, returning the underlying `Ptr`. /// Unwraps this `Pin<Ptr>`, returning the underlying `Ptr`.
/// ///
/// # Safety /// # Safety