Apply the fix in #31 to the v0.10.x branch
#37
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
The test `common::deque::basics` contains several lines that look like this:
```
assert!(std::ptr::eq(head_d, unsafe { node1_ptr.as_ref() }));
```
What is happening is that we assert that `head_c`, a reference, is equal
by-address to `node1_ptr`, a `NonNull<_>`. However, the way we do this
is by creating a reference, instead of using `as_ptr`.
The current way has several downsides:
* It requires an `unsafe` block. Comparing pointer addresses is safe so
this should be unnecessary.
* **It is unsound**, at least under Tree Borrows rules.
The references created there violate the uniqueness of references/Boxes
created internally in the `Deque`, which trips the `Deque` later when
it tries to use these internally-held references.
* It is unnecessary -- comparing the result of `as_ptr` works just the same,
maybe even faster due to less intermediary methods.
As such, the test should be updated to only use `as_ptr`. When done, it
actually makes the tests pass under Tree Borrows.
(cherry picked from commit af40a12)
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.
Fixes #32