Skip to content

Rustup #6195

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

Merged
merged 3 commits into from
Oct 19, 2020
Merged

Rustup #6195

merged 3 commits into from
Oct 19, 2020

Conversation

giraffate
Copy link
Contributor

Jacob Hughes and others added 3 commits October 17, 2020 13:48
BTreeMap: refactor Entry out of map.rs into its own file

btree/map.rs is approaching the 3000 line mark, splitting out the entry
code buys about 500 lines of headroom.

I've created this PR because the changes I've made in #77438 will push `map.rs` over the 3000 line limit and cause tidy to complain.

I picked `Entry` to factor out because it feels less tightly coupled to the rest of `BTreeMap` than the various iterator implementations.

Related: #60302
@rust-highfive
Copy link

r? @phansch

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Oct 19, 2020
@ebroto
Copy link
Member

ebroto commented Oct 19, 2020

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Oct 19, 2020

📌 Commit be136b2 has been approved by ebroto

@bors
Copy link
Contributor

bors commented Oct 19, 2020

⌛ Testing commit be136b2 with merge 3d35072...

@bors
Copy link
Contributor

bors commented Oct 19, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: ebroto
Pushing 3d35072 to master...

@bors bors merged commit 3d35072 into rust-lang:master Oct 19, 2020
@giraffate giraffate deleted the sync-from-rust branch October 19, 2020 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants