Uh oh!
There was an error while loading. Please reload this page.
BTreeMap: fix pointer provenance rules in underfullness - #78631
Conversation
Mark-Simulacrum
commented
Nov 8, 2020
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. |
bors
commented
Nov 9, 2020
☔ 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: |
ssomers
commented
Nov 9, 2020
I tweaked the name and comments of |
ssomers
commented
Nov 10, 2020
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author Also, github doesn't seem to process commits. |
Mark-Simulacrum
commented
Nov 10, 2020
First commit indeed seems to be on master, not sure why GitHub is showing it. Thanks! @bors r+ |
bors
commented
Nov 10, 2020
📌 Commit b6c26c4 has been approved by |
ssomers
commented
Nov 11, 2020
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. |
ssomers
commented
Nov 11, 2020
Aha, just one commit instead of 35 now. |
Mark-Simulacrum
commented
Nov 11, 2020
@bors r+ |
bors
commented
Nov 11, 2020
📌 Commit 5a129ac35cd7bdb64f762db4eeade48223ebf331 has been approved by |
bors
commented
Nov 12, 2020
☔ 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: |
ssomers
commented
Nov 12, 2020
Oh right, |
Mark-Simulacrum
commented
Nov 14, 2020
@bors r+ rollup=never |
bors
commented
Nov 14, 2020
📌 Commit 4cfa5bd has been approved by |
bors
commented
Nov 15, 2020
⌛ Testing commit 4cfa5bd with merge 3e5a681469d8559e2bb5f9f384487c960db92d72... |
bors
commented
Nov 15, 2020
💔 Test failed - checks-actions |
Mark-Simulacrum
commented
Nov 15, 2020
@bors retry |
bors
commented
Nov 15, 2020
⌛ Testing commit 4cfa5bd with merge 1cf9258ce60a03dbbb4589d2df424dc1e11db52c... |
bors
commented
Nov 15, 2020
💔 Test failed - checks-actions |
Mark-Simulacrum
commented
Nov 15, 2020
@bors retry |
bors
commented
Nov 16, 2020
bors
commented
Nov 16, 2020
☀️ 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