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.

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

fix confusing let chain indentation in rustc_resolve #115983

Merged
merged 1 commit into from
Sep 20, 2023

Conversation

eopb
Copy link
Contributor

@eopb eopb commented Sep 19, 2023

Sorry for opening a PR for such a minor style fix.
This just felt sufficiently misleading to warrant fixing.

@rustbot
Copy link
Collaborator

rustbot commented Sep 19, 2023

r? @oli-obk

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 19, 2023
@eopb eopb marked this pull request as ready for review September 19, 2023 20:33
Comment on lines 992 to 993
&& let Some(max_vis) = max_vis.get()
&& !max_vis.is_at_least(import.expect_vis(), self.tcx)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The correct style includes indenting the &&s. But not worth changing -- we'll be getting formatting for let-chains soon (rust-lang/rustfmt#5910)

Suggested change
&& let Some(max_vis) = max_vis.get()
&& !max_vis.is_at_least(import.expect_vis(), self.tcx)
&& let Some(max_vis) = max_vis.get()
&& !max_vis.is_at_least(import.expect_vis(), self.tcx)

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 19, 2023

📌 Commit 2243872 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Sep 19, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2023
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#115965 (Add more if let guard tests)
 - rust-lang#115978 (Copy 1.72.1 release notes to master)
 - rust-lang#115983 (fix confusing let chain indentation in rustc_resolve)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit af36ab1 into rust-lang:master Sep 20, 2023
11 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2023
Rollup merge of rust-lang#115983 - eopb:confusing-if-chain-indent, r=compiler-errors

fix confusing let chain indentation in rustc_resolve

Sorry for opening a PR for such a minor style fix.
This just felt sufficiently misleading to warrant fixing.
@rustbot rustbot added this to the 1.74.0 milestone Sep 20, 2023
@eopb eopb deleted the confusing-if-chain-indent branch September 20, 2023 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants