Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert #91403 #94088

Merged
merged 1 commit into from
Feb 18, 2022
Merged

Revert #91403 #94088

merged 1 commit into from
Feb 18, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 17, 2022

@oli-obk
Revert "Auto merge of rust-lang#91403 - cjgillot:inherit-async, r=oli…
86d17b9 
…-obk"

This reverts commit 3cfa4de, reversing
changes made to 5d8767c.
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 17, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2022
@jackh726
Copy link
Member

@bors r+ p=1

To ensure this gets into the beta cut

@bors
Copy link
Contributor

bors commented Feb 17, 2022

📌 Commit 86d17b9 has been approved by jackh726

@bors bors 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 Feb 17, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 17, 2022
@matthiaskrgr
Rollup merge of rust-lang#94088 - oli-obk:revert, r=jackh726
d69ddd4 
Revert rust-lang#91403

fixes rust-lang#94004

r? `@pnkfelix` `@cjgillot`
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 17, 2022
Closed
@bors
Copy link
Contributor

bors commented Feb 18, 2022

⌛ Testing commit 86d17b9 with merge 21eb2f7b0c79e0d8f743328957764127328e43d2...

@bors
Copy link
Contributor

bors commented Feb 18, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 18, 2022
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 18, 2022

@bors retry log is empty, no discernible failure

@bors bors 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 Feb 18, 2022
@bors
Copy link
Contributor

bors commented Feb 18, 2022

⌛ Testing commit 86d17b9 with merge feac2ec...

@bors
Copy link
Contributor

bors commented Feb 18, 2022

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing feac2ec to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2022
@bors bors merged commit feac2ec into rust-lang:master Feb 18, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 18, 2022
@bors bors mentioned this pull request Feb 18, 2022
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (feac2ec): comparison url.

Summary: This benchmark run shows 2 relevant improvements 🎉 but 7 relevant regressions 😿 to instruction counts.

  • Average relevant regression: 1.1%
  • Average relevant improvement: -1.5%
  • Largest improvement in instruction counts: -1.7% on full builds of issue-88862 check
  • Largest regression in instruction counts: 1.7% on incr-unchanged builds of clap-rs check

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

@rustbot rustbot added the perf-regression Performance regression. label Feb 18, 2022
@oli-obk oli-obk deleted the revert branch February 18, 2022 13:10
This was referenced Feb 20, 2022
Closed
Closed
@oli-obk oli-obk restored the revert branch February 22, 2022 17:10
@rylev
Copy link
Member

rylev commented Feb 24, 2022

The perf regressions here are relatively minor, and this change fixes a correctness issue, so I think it's fine to let it through.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Feb 24, 2022
@oli-obk oli-obk deleted the revert branch February 24, 2022 13:25
flip1995 pushed a commit to flip1995/rust that referenced this pull request Feb 24, 2022
@bors
Auto merge of rust-lang#94088 - oli-obk:revert, r=jackh726
a703a82 
Revert rust-lang#91403

fixes rust-lang#94004

r? `@pnkfelix` `@cjgillot`
@Xiretza Xiretza mentioned this pull request Apr 24, 2022
Closed
@tmandry tmandry mentioned this pull request May 3, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.

Nightly compiler bug: "lifetime mismatch"
9 participants
@oli-obk @rust-highfive @jackh726 @bors @rust-log-analyzer @rust-timer @rylev @pnkfelix @rustbot