-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
BTreeMap: fix pointer provenance rules in underfullness #78631
Conversation
07adb06
to
33201e3
Compare
33201e3
to
27e9109
Compare
r=me on the last commit (I did not review the first two, but I believe they have been previously reviewed, so that shouldn't be a concern). Ping me when those are rebased away after the previous PRs land, please. |
☔ The latest upstream changes (presumably #78889) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:
|
7a2fe72
to
b6c26c4
Compare
I tweaked the name and comments of |
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author Also, github doesn't seem to process commits. |
First commit indeed seems to be on master, not sure why GitHub is showing it. Thanks! @bors r+ |
📌 Commit b6c26c4 has been approved by |
The commit you approved is the one GitHub showed me too, but I had (tried to) push a rebase on the newest master. Now GitHub sees that rebase commit, but somehow it's still targeting the old master. While the branch of this PR looks perfectly normal in GitHub itself: one commit on a recent master. I doubt bors will attempt to take off in this state, so trying to wake up GitHub by pushing an even fresher rebase. |
5709363
to
5a129ac
Compare
Aha, just one commit instead of 35 now. |
@bors r+ |
📌 Commit 5a129ac35cd7bdb64f762db4eeade48223ebf331 has been approved by |
☔ The latest upstream changes (presumably #78956) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:
|
@bors r+ rollup=never |
📌 Commit 4cfa5bd has been approved by |
⌛ Testing commit 4cfa5bd with merge 3e5a681469d8559e2bb5f9f384487c960db92d72... |
💔 Test failed - checks-actions |
@bors retry |
⌛ Testing commit 4cfa5bd with merge 1cf9258ce60a03dbbb4589d2df424dc1e11db52c... |
💔 Test failed - checks-actions |
@bors retry |
☀️ Test successful - checks-actions |
Continuing on #78480, and for readability, and possibly for performance: avoid aliasing when handling underfull nodes, and consolidate the code doing that. In particular:
remove_kv_tracking
.ptr::read
, before resuming on the leaf level.r? @Mark-Simulacrum