Skip to content

Revert most of MaybeUninit, except for the new API itself - #54554

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:maybe-uninit
Sep 29, 2018
Merged

Revert most of MaybeUninit, except for the new API itself#54554
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:maybe-uninit

Conversation

@RalfJung

@RalfJungRalfJung commented Sep 25, 2018•
edited
Loading

Copy link
Copy Markdown
Member

This reverts most of #53508 for perf reasons (first commit reverts that entire PR), except for the new API itself (added back in 2nd commit).

@rust-highfive

rust-highfive commented Sep 25, 2018

Copy link
Copy Markdown
Contributor

r? @withoutboats

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2018
@RalfJungRalfJung mentioned this pull request Sep 25, 2018
Merged
@RalfJung

RalfJung commented Sep 25, 2018

Copy link
Copy Markdown
MemberAuthor

@rust-lang/wg-compiler-performance I'd prefer to also include 96572cb but wasn't sure if you'd be happy with that.

@nagisa

nagisa commented Sep 25, 2018

Copy link
Copy Markdown
Member

Do we know why the regression occurred?

@withoutboats

withoutboats commented Sep 25, 2018

Copy link
Copy Markdown
Contributor

@r? @eddyb

@RalfJung

RalfJung commented Sep 25, 2018

Copy link
Copy Markdown
MemberAuthor

@nagisa No. Don't have time to do any research right now, I am on a conference.

But my preliminary plan was to then re-submit "half" of the remaining commits and see if perf complains, etc. My guess is that it's the BTreeMap changes. Though I'd also be happy if someone else does all of that, ;)

@nagisa

nagisa commented Sep 25, 2018

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Sep 25, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit b595e4f82377bb2c50201b3fc8b1f528cdc49b93 has been approved by nagisa

@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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 25, 2018
@bors

bors commented Sep 26, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #54575) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2018
@nagisa

nagisa commented Sep 27, 2018

Copy link
Copy Markdown
Member

@RalfJung this wants a rebase.

@RalfJung

RalfJung commented Sep 27, 2018 via email

Copy link
Copy Markdown
MemberAuthor

@RalfJung

RalfJung commented Sep 29, 2018

Copy link
Copy Markdown
MemberAuthor

Rebase done.

@bors r=nagisa

@bors

bors commented Sep 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 546e45a has been approved by nagisa

@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 29, 2018
@kennytm

kennytm commented Sep 29, 2018

Copy link
Copy Markdown
Member

@bors p=15

rollup fairness

@bors

bors commented Sep 29, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 546e45a with merge 7e7bc06...

bors added a commit that referenced this pull request Sep 29, 2018
@bors
Auto merge of#54554- RalfJung:maybe-uninit, r=nagisa
7e7bc06
Revert most of MaybeUninit, except for the new API itself
This reverts most of #53508 for perf reasons (first commit reverts that entire PR), except for the new API itself (added back in 2nd commit).
@bors

bors commented Sep 29, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nagisa
Pushing 7e7bc06 to master...

@bors
bors merged commit 546e45a into rust-lang:masterSep 29, 2018
This was referenced Sep 29, 2018
Closed
Merged
Merged
@nnethercote

nnethercote commented Oct 25, 2018

Copy link
Copy Markdown
Contributor

The final perf improvements from this landing are here.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@eddybeddyb

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@RalfJung@rust-highfive@nagisa@withoutboats@bors@kennytm@nnethercote@eddyb@japaric