Skip to content
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: move generic support functions out of navigate.rs #78359

Merged
merged 1 commit into from
Oct 27, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Oct 25, 2020

A preparatory step chipped off #78104, useful in general (if at all).

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 25, 2020
@ssomers
Copy link
Contributor Author

ssomers commented Oct 25, 2020

Note this would be another benign conflict postponing #78015 (because of the alphabetically close new module names), but to me it seems sensible to do it first.

@jyn514 jyn514 added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 25, 2020
@bors
Copy link
Contributor

bors commented Oct 26, 2020

☔ The latest upstream changes (presumably #78015) 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:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@Mark-Simulacrum
Copy link
Member

Oh, hm, I did not see this before that other PR. If you want to ping me on Zulip to just say "please review in this order" or whatever, that's fine by me -- otherwise I usually go in oldest first order in my waiting-on-review queue.

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2020
@Mark-Simulacrum
Copy link
Member

r=me though on the change itself (I think I approved a similar commit elsewhere, IIRC a bit smaller but I might be misremembering)

@ssomers
Copy link
Contributor Author

ssomers commented Oct 26, 2020

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

Still feeding this commit separately, because it's simple and logically distinct, even though you approved the rest of #78104 (without the no-rollup constraint, to my surprise, but I'm just beginning to understand that process).

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 26, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 26, 2020

📌 Commit 0da7941 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2020
@bors
Copy link
Contributor

bors commented Oct 27, 2020

⌛ Testing commit 0da7941 with merge c9b606e...

@bors
Copy link
Contributor

bors commented Oct 27, 2020

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing c9b606e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2020
@bors bors merged commit c9b606e into rust-lang:master Oct 27, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 27, 2020
@ssomers ssomers deleted the btree_cleanup_mem branch October 27, 2020 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants