BTreeMap: split off most code of remove and split_off#78056
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 21, 2020
ssomers:btree_chop_up_1
Merged
BTreeMap: split off most code of remove and split_off#78056bors merged 1 commit intorust-lang:masterfrom ssomers:btree_chop_up_1
bors merged 1 commit intorust-lang:masterfrom
ssomers:btree_chop_up_1
Conversation
Contributor
Author
|
It's also possible to do the same for |
Collaborator
|
☔ The latest upstream changes (presumably #78060) 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: |
Contributor
Author
|
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author |
Contributor
Author
|
tidy does not report on extraneous empty lines on Windows like it does on Linux!? |
Member
|
@bors r+ |
Collaborator
|
📌 Commit 003516f has been approved by |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Oct 21, 2020
BTreeMap: split off most code of remove and split_off Putting map.rs on a diet, in addition to rust-lang#77851. r? @dtolnay
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 21, 2020
Rollup of 7 pull requests Successful merges: - rust-lang#77726 (Add Pin::static_ref, static_mut.) - rust-lang#78002 (Tweak "object unsafe" errors) - rust-lang#78056 (BTreeMap: split off most code of remove and split_off) - rust-lang#78063 (Improve wording of "cannot multiply" type error) - rust-lang#78094 (rustdoc: Show the correct source filename in page titles, without `.html`) - rust-lang#78101 (fix static_ptr_ty for foreign statics) - rust-lang#78118 (Inline const followups) Failed merges: r? `@ghost`
This file contains hidden or 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
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.
Putting map.rs on a diet, in addition to #77851.
r? @dtolnay