Skip to content

BTreeMap: more refactoring around edges - #77244

Merged
bors merged 2 commits into
rust-lang:masterfrom
ssomers:btree_love_the_leaf_edge
Oct 21, 2020
Merged

BTreeMap: more refactoring around edges#77244
bors merged 2 commits into
rust-lang:masterfrom
ssomers:btree_love_the_leaf_edge

Conversation

@ssomers

@ssomersssomers commented Sep 26, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Continuation of #77005.

r? @Mark-Simulacrum

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2020
@ssomers

ssomers commented Sep 30, 2020

Copy link
Copy Markdown
ContributorAuthor

Avoided an unsafe block with Unique::from

Mark-Simulacrum
Mark-Simulacrum reviewed Sep 30, 2020
View reviewed changes

@Mark-SimulacrumMark-Simulacrum left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left a couple comments, but maybe I need to sit down for longer with these PRs -- I am still feeling like I am not seeing a clear picture of where they are going. I will try to allocate some time to do so, but unfortunately it might be a week or so at least.

Comment threadlibrary/alloc/src/collections/btree/node.rs Outdated
Comment threadlibrary/alloc/src/collections/btree/node.rs Outdated
@ssomers

ssomers commented Oct 1, 2020

Copy link
Copy Markdown
ContributorAuthor

Chipped off two commits to focus on the first commit for now.

@ssomersssomers mentioned this pull request Oct 2, 2020
Merged
@ssomers
ssomers marked this pull request as draft October 2, 2020 23:11
@Mark-SimulacrumMark-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 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 5, 2020
@Dylan-DPC
Rollup merge ofrust-lang#77471- ssomers:btree_cleanup_3, r=Mark-Sim…
23b1e3d
…ulacrum
BTreeMap: refactoring around edges, missed spots
Tweaks from rust-lang#77244 (and more) that are really inconsistencies in rust-lang#77005.
r? @Mark-Simulacrum
@ssomers
ssomers marked this pull request as ready for review October 6, 2020 19:27
@ssomers

ssomers commented Oct 16, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@rustbotrustbot 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 16, 2020
@ssomersssomers mentioned this pull request Oct 19, 2020
Merged
Mark-Simulacrum
Mark-Simulacrum reviewed Oct 19, 2020
View reviewed changes
Comment threadlibrary/alloc/src/collections/btree/node.rs Outdated
Mark-Simulacrum
Mark-Simulacrum reviewed Oct 19, 2020
View reviewed changes
Comment threadlibrary/alloc/src/collections/btree/node.rs Outdated
@Mark-SimulacrumMark-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 19, 2020
@Mark-Simulacrum

Mark-Simulacrum commented Oct 20, 2020

Copy link
Copy Markdown
Member

Okay, I think this is better. Thanks!

@bors r+ rollup=never

@bors

bors commented Oct 20, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 76c466a has been approved by Mark-Simulacrum

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 20, 2020
@ssomersssomers mentioned this pull request Oct 20, 2020
Closed
@bors

bors commented Oct 20, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 76c466a with merge f965120...

@bors

bors commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2020
@bors
bors merged commit f965120 into rust-lang:masterOct 21, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 21, 2020
@borsbors mentioned this pull request Oct 21, 2020
Closed
@ssomers
ssomers deleted the btree_love_the_leaf_edge branch October 21, 2020 08:47
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.49.0

Development

Successfully merging this pull request may close these issues.

5 participants

@ssomers@Mark-Simulacrum@bors@rust-highfive@rustbot