BTreeMap: wrap node's raw parent pointer in NonNull #76929
Merged
Conversation
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
rust-highfive
added
the
S-waiting-on-review
| let parent_as_leaf = unsafe { (*self.as_leaf_ptr()).parent as *const LeafNode<K, V> }; | ||
| if let Some(non_zero) = NonNull::new(parent_as_leaf as *mut _) { | ||
| let leaf_ptr = self.as_leaf_ptr(); | ||
| if let &Some(non_zero) = &unsafe { (*leaf_ptr).parent } { |
There was a problem hiding this comment.
Hm, this looks a bit odd -- maybe we can drop the reference on both sides (in the pattern and before unsafe)?
There was a problem hiding this comment.
But then it's moved out of the option. Before this I had:
if let Some(non_zero) = unsafe { (*leaf_ptr).parent.as_ref() } {
There was a problem hiding this comment.
I think I prefer the latter form, it looks clearer to me.
There was a problem hiding this comment.
How about this fancy one?
There was a problem hiding this comment.
Also straigthened out the conversions to usize.
jyn514
added
the
T-libs
ssomers
force-pushed
the
btree_cleanup_2
branch
from
66a16c9 to
0661b0a
Compare
|
@bors r+ rollup=never |
|
📌 Commit 0661b0a has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions, checks-azure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Now that the other
*const(root) is gone, seemed like a small step forward.r? @Mark-Simulacrum