Skip to content

BtreeMap: refactoring around edges - #77005

Merged
bors merged 3 commits into
rust-lang:masterfrom
ssomers:btree_cleanup_3
Sep 25, 2020
Merged

BtreeMap: refactoring around edges#77005
bors merged 3 commits into
rust-lang:masterfrom
ssomers:btree_cleanup_3

Conversation

@ssomers

Copy link
Copy Markdown
Contributor

Parts chipped off a more daring effort, that the btree benchmarks judge to be performance-neutral.

r? @Mark-Simulacrum

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 21, 2020
Comment threadlibrary/alloc/src/collections/btree/node.rs Outdated
@jyn514jyn514 added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 22, 2020
@ssomers

Copy link
Copy Markdown
ContributorAuthor

Rebased & some more minor and comment tweaks added

Comment threadlibrary/alloc/src/collections/btree/node.rs Outdated
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 Sep 24, 2020
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+

Thanks!

@bors

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 55fa8af 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 Sep 25, 2020
This was referenced Sep 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 25, 2020
…as-schievink
Rollup of 15 pull requests
Successful merges:
- rust-lang#76932 (Relax promises about condition variable.)
- rust-lang#76973 (Unstably allow assume intrinsic in const contexts)
- rust-lang#77005 (BtreeMap: refactoring around edges)
- rust-lang#77066 (Fix dest prop miscompilation around references)
- rust-lang#77073 (dead_code: look at trait impls even if they don't contain items)
- rust-lang#77086 (Include libunwind in the rust-src component.)
- rust-lang#77097 (Make [].as_[mut_]ptr_range() (unstably) const.)
- rust-lang#77106 (clarify that `changelog-seen = 1` goes to the beginning of config.toml)
- rust-lang#77120 (Add `--keep-stage-std` to `x.py` for keeping only standard library artifacts)
- rust-lang#77126 (Invalidate local LLVM cache less often)
- rust-lang#77146 (Install std for non-host targets)
- rust-lang#77155 (remove enum name from ImplSource variants)
- rust-lang#77176 (Removing erroneous semicolon in transmute documentation)
- rust-lang#77183 (Allow multiple allow_internal_unstable attributes)
- rust-lang#77189 (Remove extra space from vec drawing)
Failed merges:
r? `@ghost`
@bors
bors merged commit e8dc07c into rust-lang:masterSep 25, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 25, 2020
@ssomers
ssomers deleted the btree_cleanup_3 branch September 26, 2020 15:21
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 5, 2020
…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
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 20, 2020
…ark-Simulacrum
BTreeMap: more refactoring around edges
Continuation of rust-lang#77005.
r? `@Mark-Simulacrum`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant 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.

6 participants

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