Skip to content

Refactor: use format-args-capture and remove unnecessary nested if blocks in some parts of rust_passes#95074

Merged
bors merged 1 commit into
rust-lang:masterfrom
TaKO8Ki:use-format-args-capture-and-remove-unnecessary-nesting-in-rustc-passes
Mar 21, 2022
Merged

Refactor: use format-args-capture and remove unnecessary nested if blocks in some parts of rust_passes#95074
bors merged 1 commit into
rust-lang:masterfrom
TaKO8Ki:use-format-args-capture-and-remove-unnecessary-nesting-in-rustc-passes

Conversation

@TaKO8Ki

@TaKO8Ki TaKO8Ki commented Mar 18, 2022

Copy link
Copy Markdown
Member

No description provided.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 18, 2022
@rust-highfive

rust-highfive commented Mar 18, 2022

Copy link
Copy Markdown
Contributor

r? @lcnr

(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 Mar 18, 2022
@TaKO8Ki TaKO8Ki force-pushed the use-format-args-capture-and-remove-unnecessary-nesting-in-rustc-passes branch from c502fc8 to 018e925 Compare March 18, 2022 13:52
@lcnr

lcnr commented Mar 18, 2022

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 18, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 018e925e866b8c9c6807714b77e15d8df5df667a has been approved by lcnr

@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 Mar 18, 2022
@bugadani

bugadani commented Mar 18, 2022

Copy link
Copy Markdown
Contributor

@lcnr

Is it a good idea to approve PRs like this while a similar one might potentially being reverted? #95062

@lcnr

lcnr commented Mar 18, 2022

Copy link
Copy Markdown
Contributor

@bors r-

@bors bors 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 Mar 18, 2022
@lcnr

lcnr commented Mar 18, 2022

Copy link
Copy Markdown
Contributor

didn't know about the revert, considering that the reason was a perf regression

@bors try @rust-timer queue

@rust-timer

rust-timer commented Mar 18, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 18, 2022
@bors

bors commented Mar 18, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 018e925e866b8c9c6807714b77e15d8df5df667a with merge b3fc9cd52d12e5aa8124ad61828ef7ffa3c37dc1...

joshtriplett
joshtriplett reviewed Mar 18, 2022
View reviewed changes
Comment thread compiler/rustc_passes/src/intrinsicck.rs Outdated
@TaKO8Ki

TaKO8Ki commented Mar 19, 2022

Copy link
Copy Markdown
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 19, 2022
@TaKO8Ki TaKO8Ki requested a review from joshtriplett March 20, 2022 10:03
@lcnr

lcnr commented Mar 21, 2022

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit c777efe6513eaa452bbd78f9794fec913014c500 with merge ffda9900c208508649f68118720ab65d0e3c8403...

@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: ffda9900c208508649f68118720ab65d0e3c8403 (ffda9900c208508649f68118720ab65d0e3c8403)

@rust-timer

rust-timer commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

Queued ffda9900c208508649f68118720ab65d0e3c8403 with parent 051d117, future comparison URL.

@rust-timer

rust-timer commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (ffda9900c208508649f68118720ab65d0e3c8403): comparison url.

Summary: This benchmark run did not return any relevant results.

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

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 21, 2022
@lcnr

lcnr commented Mar 21, 2022

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit c777efe6513eaa452bbd78f9794fec913014c500 has been approved by lcnr

@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 Mar 21, 2022
@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c777efe6513eaa452bbd78f9794fec913014c500 with merge 784b4391b003bde69913a996d2c2831c8b211fa4...

bjorn3
bjorn3 reviewed Mar 21, 2022
View reviewed changes
Comment thread compiler/rustc_passes/src/check_const.rs Outdated
@lcnr

lcnr commented Mar 21, 2022

Copy link
Copy Markdown
Contributor

@bors r-

@bors delegate+

@bors bors 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 Mar 21, 2022
@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

✌️ @TaKO8Ki can now approve this pull request

@TaKO8Ki @bjorn3
use format-args-capture and remove unnecessary nested if blocks in …
7262066 
…some parts of rustc_passes

break before the `&&`

Update compiler/rustc_passes/src/check_const.rs

Co-authored-by: bjorn3 <bjorn3@users.noreply.github.com>
@TaKO8Ki TaKO8Ki force-pushed the use-format-args-capture-and-remove-unnecessary-nesting-in-rustc-passes branch from 6a2bcf7 to 7262066 Compare March 21, 2022 15:02
@TaKO8Ki TaKO8Ki requested a review from bjorn3 March 21, 2022 15:03
@rust-log-analyzer

rust-log-analyzer commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

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

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

@bjorn3

bjorn3 commented Mar 21, 2022

Copy link
Copy Markdown
Member

@bors r=lcnr

@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 7262066 has been approved by lcnr

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 21, 2022
@bjorn3 bjorn3 removed their request for review March 21, 2022 15:47
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 21, 2022
@matthiaskrgr
Rollup merge of rust-lang#95074 - TaKO8Ki:use-format-args-capture-and…
f9e929a 
…-remove-unnecessary-nesting-in-rustc-passes, r=lcnr

Refactor: use `format-args-capture` and remove unnecessary nested if blocks in some parts of `rust_passes`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 21, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 21, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2022
@bors
Auto merge of rust-lang#95180 - matthiaskrgr:rollup-ai1ch2s, r=matthi…
3c17c84 
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#95074 (Refactor: use `format-args-capture` and remove unnecessary nested if blocks in some parts of `rust_passes`)
 - rust-lang#95085 (Return err instead of ICE)
 - rust-lang#95116 (Add needs-* directives to many tests)
 - rust-lang#95129 (Remove animation on source sidebar)
 - rust-lang#95166 (Update the unstable book with the new `values()` form of check-cfg)
 - rust-lang#95175 (move `adt_const_params`  to its own tracking issue)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e3557e2 into rust-lang:master Mar 21, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 21, 2022
@TaKO8Ki TaKO8Ki deleted the use-format-args-capture-and-remove-unnecessary-nesting-in-rustc-passes branch March 29, 2022 03:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@joshtriplett joshtriplett Awaiting requested review from joshtriplett

Assignees

@lcnr lcnr

Labels

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.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

10 participants

@TaKO8Ki @rust-highfive @lcnr @bors @bugadani @rust-timer @rust-log-analyzer @bjorn3 @joshtriplett @rustbot