diff options
| author | Andreas Molzer <andreas.molzer@gmx.de> | 2022-03-12 00:21:35 +0100 |
|---|---|---|
| committer | Andreas Molzer <andreas.molzer@gmx.de> | 2022-03-23 19:59:37 +0100 |
| commit | d489ea777d38c5d44a5394bcd4bdcc69eb3cda40 (patch) | |
| tree | 985baf4f181fa45d9d28ed993aa2b5e04280a2cb /library/alloc/src/sync.rs | |
| parent | c9b45e601065c3fb71a4f67481e912391d075621 (diff) | |
| download | rust-d489ea777d38c5d44a5394bcd4bdcc69eb3cda40.tar.gz rust-d489ea777d38c5d44a5394bcd4bdcc69eb3cda40.zip | |
Refactor set_ptr_value as with_metadata_of
By reversing the arguments we achieve several clarifications: - The function closely resembles `cast` but with an argument to initialized the metadata. This is easier to teach and answers an long outstanding question that had restricted cast to `Sized` targets initially. See multiples reviews of <https://github.com/rust-lang/rust/pull/47631> - The 'object identity', in the form or provenance, is now preserved from the call receiver to the result. This helps explain the method as a builder-style, instead of some kind of setter that would modify something in-place. Ensuring that the result has the identity of the `self` argument is also beneficial for an intuition of effects. - An outstanding concern, 'Correct argument type', is avoided by not committing to any specific argument type. This is consistent with cast which does not require its receiver to be a raw address.
Diffstat (limited to 'library/alloc/src/sync.rs')
| -rw-r--r-- | library/alloc/src/sync.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index 2140c3f168d..e302f874bfd 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -895,7 +895,8 @@ impl<T: ?Sized> Arc<T> { let offset = data_offset(ptr); // Reverse the offset to find the original ArcInner. - let arc_ptr = (ptr as *mut ArcInner<T>).set_ptr_value((ptr as *mut u8).offset(-offset)); + let arc_ptr = + (ptr as *mut u8).offset(-offset).with_metadata_of(ptr as *mut ArcInner<T>); Self::from_ptr(arc_ptr) } @@ -1182,7 +1183,7 @@ impl<T: ?Sized> Arc<T> { Self::allocate_for_layout( Layout::for_value(&*ptr), |layout| Global.allocate(layout), - |mem| (ptr as *mut ArcInner<T>).set_ptr_value(mem) as *mut ArcInner<T>, + |mem| mem.with_metadata_of(ptr as *mut ArcInner<T>), ) } } @@ -1887,7 +1888,7 @@ impl<T: ?Sized> Weak<T> { let offset = unsafe { data_offset(ptr) }; // Thus, we reverse the offset to get the whole RcBox. // SAFETY: the pointer originated from a Weak, so this offset is safe. - unsafe { (ptr as *mut ArcInner<T>).set_ptr_value((ptr as *mut u8).offset(-offset)) } + unsafe { (ptr as *mut u8).offset(-offset).with_metadata_of(ptr as *mut ArcInner<T>) } }; // SAFETY: we now have recovered the original Weak pointer, so can create the Weak. |
