Skip to content

Reland #74069 - #74802

Merged
bors merged 3 commits into
rust-lang:masterfrom
Mark-Simulacrum:reland-74069
Aug 12, 2020
Merged

Reland #74069#74802
bors merged 3 commits into
rust-lang:masterfrom
Mark-Simulacrum:reland-74069

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Investigation in #74716 has concluded that this PR is indeed not a regression (and in fact the rollup itself is not either).

This reverts the revert in #74611.

r? @nnethercote cc @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 27, 2020
@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

@bors try @rust-timer queue

Let's double check just in case that this is indeed performance neutral.

@rust-timer

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@bors

bors commented Jul 27, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 144b159 with merge 93a1b4821b7cb7b883a996d4787c3fd60fb4fe47...

@bors

bors commented Jul 27, 2020

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions, checks-azure
Build commit: 93a1b4821b7cb7b883a996d4787c3fd60fb4fe47 (93a1b4821b7cb7b883a996d4787c3fd60fb4fe47)

@rust-timer

Copy link
Copy Markdown
Collaborator

Queued 93a1b4821b7cb7b883a996d4787c3fd60fb4fe47 with parent c709862, future comparison URL.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit (93a1b4821b7cb7b883a996d4787c3fd60fb4fe47): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never

@nnethercote

Copy link
Copy Markdown
Contributor

Perf effects are minimal, if anything a tiny improvement.

@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

@nnethercote or @eddyb, I think this is good to go, would someone mind r+ing?

@nnethercote

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 144b159 has been approved by nnethercote

@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 Aug 11, 2020
@bors

bors commented Aug 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 144b159 with merge 873fc46...

@borsbors mentioned this pull request Aug 11, 2020
@bors

bors commented Aug 12, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: nnethercote
Pushing 873fc46 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 12, 2020
@bors
bors merged commit 873fc46 into rust-lang:masterAug 12, 2020
@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

8 participants

@Mark-Simulacrum@rust-timer@bors@nnethercote@cuviper@rust-highfive@eddyb@erikdesjardins