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.
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
tokio: avoid temporary references in Link impls #4841
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
//! This module defines a macro that lets you go from a raw pointer to a struct | ||
//! to a raw pointer to a field of the struct. | ||
|
||
#[cfg(not(tokio_no_addr_of))] | ||
macro_rules! generate_addr_of_methods { | ||
( | ||
impl<$($gen:ident)*> $struct_name:ty {$( | ||
$(#[$attrs:meta])* | ||
$vis:vis unsafe fn $fn_name:ident(self: NonNull<Self>) -> NonNull<$field_type:ty> { | ||
&self$(.$field_name:tt)+ | ||
} | ||
)*} | ||
) => { | ||
impl<$($gen)*> $struct_name {$( | ||
$(#[$attrs])* | ||
$vis unsafe fn $fn_name(me: ::core::ptr::NonNull<Self>) -> ::core::ptr::NonNull<$field_type> { | ||
let me = me.as_ptr(); | ||
let field = ::std::ptr::addr_of_mut!((*me) $(.$field_name)+ ); | ||
::core::ptr::NonNull::new_unchecked(field) | ||
} | ||
)*} | ||
}; | ||
} | ||
|
||
// The `addr_of_mut!` macro is only available for MSRV at least 1.51.0. This | ||
// version of the macro uses a workaround for older versions of rustc. | ||
#[cfg(tokio_no_addr_of)] | ||
macro_rules! generate_addr_of_methods { | ||
( | ||
impl<$($gen:ident)*> $struct_name:ty {$( | ||
$(#[$attrs:meta])* | ||
$vis:vis unsafe fn $fn_name:ident(self: NonNull<Self>) -> NonNull<$field_type:ty> { | ||
&self$(.$field_name:tt)+ | ||
} | ||
)*} | ||
) => { | ||
impl<$($gen)*> $struct_name {$( | ||
$(#[$attrs])* | ||
$vis unsafe fn $fn_name(me: ::core::ptr::NonNull<Self>) -> ::core::ptr::NonNull<$field_type> { | ||
let me = me.as_ptr(); | ||
let me_u8 = me as *mut u8; | ||
|
||
let field_offset = { | ||
let me_ref = &*me; | ||
let field_ref_u8 = (&me_ref $(.$field_name)+ ) as *const $field_type as *const u8; | ||
field_ref_u8.offset_from(me_u8) | ||
}; | ||
|
||
::core::ptr::NonNull::new_unchecked(me_u8.offset(field_offset).cast()) | ||
} | ||
)*} | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is ok since
Pointers
already contains anUnsafeCell
.tokio/tokio/src/util/linked_list.rs
Lines 70 to 73 in 922fc91