Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Weak::as_ptr and friends for unsized T #74160

Merged
merged 6 commits into from
Oct 3, 2020
Merged

Allow Weak::as_ptr and friends for unsized T #74160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7289383
Adjust rc::Weak::from_raw to support unsized T
CAD97 Jul 8, 2020
0c61ce2
?Sized bounds for rc::Weak::as_ptr and friends
CAD97 Jul 8, 2020
5e7406c
Adjust sync::Weak::from_raw to support unsized T
CAD97 Jul 14, 2020
9d9903c
Allow Weak::as_ptr and friends for unsized T
CAD97 Jul 14, 2020
3d07108
Add tests for weak into/from raw
CAD97 Jul 14, 2020
e27ef13
grammar nit
RalfJung Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
grammar nit
  • Loading branch information
@RalfJung
RalfJung authored Oct 3, 2020
commit e27ef130c1d1cc7d8c3779a4e66e413a7a943ad4
2 changes: 1 addition & 1 deletion library/alloc/src/rc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ impl<T: ?Sized> Weak<T> {
let offset = unsafe { data_offset(ptr) };

// Reverse the offset to find the original RcBox.
// SAFETY: we use wrapping_offset here because the pointer may be dangling (iff T: Sized).
// SAFETY: we use wrapping_offset here because the pointer may be dangling (but only if T: Sized).
let ptr = unsafe {
set_data_ptr(ptr as *mut RcBox<T>, (ptr as *mut u8).wrapping_offset(-offset))
};
Expand Down
2 changes: 1 addition & 1 deletion library/alloc/src/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ impl<T: ?Sized> Weak<T> {
let offset = unsafe { data_offset(ptr) };

// Reverse the offset to find the original ArcInner.
// SAFETY: we use wrapping_offset here because the pointer may be dangling (iff T: Sized)
// SAFETY: we use wrapping_offset here because the pointer may be dangling (but only if T: Sized)
let ptr = unsafe {
set_data_ptr(ptr as *mut ArcInner<T>, (ptr as *mut u8).wrapping_offset(-offset))
};
Expand Down