Improve error message for `||` (or) in let chains #140272

Kivooeo · 2025-04-24T22:26:12Z

Description

This PR improves the error message when using || in an if let chain expression, addressing #140263.

Changes

Creates a dedicated error message specifically for || usage in let chains
Points the primary span directly at the || operator
Removes confusing secondary notes about "let statements" and unsupported contexts
Adds UI tests verifying the new error message and valid cases

Before

error: expected expression, found let statement
 --> src/main.rs:2:8
  |
2 |     if let true = true || false {}
  |        ^^^^^^^^^^^^^^^
  |
  = note: only supported directly in conditions of if and while expressions
note: || operators are not supported in let chain expressions
 --> src/main.rs:2:24
  |
2 |     if let true = true || false {}
  |

After

error: `||` operators are not supported in let chain conditions
 --> src/main.rs:2:24
  |
2 |     if let true = true || false {}
  |                        ^^

Implementation details

Added new OrInLetChain diagnostic in errors.rs
Modified CondChecker in expr.rs to prioritize the || error
Updated fluent message definitions to use clearer wording

Related issue
Fixes #140263

cc @ehuss (issue author)

rustbot · 2025-04-24T22:26:17Z

r? @SparrowLii

rustbot has assigned @SparrowLii.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Kivooeo · 2025-04-24T22:42:25Z

@est31 if you interested in this pr i would love to see you as reviewer, also seems like there was an update or something so got conflict :(
I will resolve it tomorrow but for now you can see tests and how it works, thanks!
I also saw your recommendation about change "expression" wording to "condition" I will fix it as well tomorrow

tests/ui/parser/or-in-let-chain.rs

compiler/rustc_parse/messages.ftl

est31 · 2025-04-25T20:27:47Z

@bors r+ rollup

bors · 2025-04-25T20:27:49Z

📌 Commit f072d30 has been approved by est31

It is now in the queue for this repository.

Improve error message for `||` (or) in let chains **Description** This PR improves the error message when using `||` in an if let chain expression, addressing rust-lang#140263. **Changes** 1. Creates a dedicated error message specifically for `||` usage in let chains 2. Points the primary span directly at the `||` operator 3. Removes confusing secondary notes about "let statements" and unsupported contexts 5. Adds UI tests verifying the new error message and valid cases **Before** ```rust error: expected expression, found let statement --> src/main.rs:2:8 | 2 | if let true = true || false {} | ^^^^^^^^^^^^^^^ | = note: only supported directly in conditions of if and while expressions note: || operators are not supported in let chain expressions --> src/main.rs:2:24 | 2 | if let true = true || false {} | ``` **After** ```rust error: `||` operators are not supported in let chain conditions --> src/main.rs:2:24 | 2 | if let true = true || false {} | ^^ ``` **Implementation details** 1. Added new `OrInLetChain` diagnostic in errors.rs 2. Modified `CondChecker` in expr.rs to prioritize the `||` error 3. Updated fluent message definitions to use clearer wording **Related issue** Fixes rust-lang#140263 cc `@ehuss` (issue author)

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#139865 (Stabilize proc_macro::Span::{start,end,line,column}.) - rust-lang#140086 (If creating a temporary directory fails with permission denied then retry with backoff) - rust-lang#140216 (Document that "extern blocks must be unsafe" in Rust 2024) - rust-lang#140220 (Fix detection of main function if there are expressions around it) - rust-lang#140253 (Add XtensaAsmPrinter) - rust-lang#140272 (Improve error message for `||` (or) in let chains) - rust-lang#140305 (Track per-obligation recursion depth only if there is inference in the new solver) - rust-lang#140306 (handle specialization in the new trait solver) - rust-lang#140308 (stall generator witness obligations: add regression test) r? `@ghost` `@rustbot` modify labels: rollup

Improve error message for `||` (or) in let chains **Description** This PR improves the error message when using `||` in an if let chain expression, addressing rust-lang#140263. **Changes** 1. Creates a dedicated error message specifically for `||` usage in let chains 2. Points the primary span directly at the `||` operator 3. Removes confusing secondary notes about "let statements" and unsupported contexts 5. Adds UI tests verifying the new error message and valid cases **Before** ```rust error: expected expression, found let statement --> src/main.rs:2:8 | 2 | if let true = true || false {} | ^^^^^^^^^^^^^^^ | = note: only supported directly in conditions of if and while expressions note: || operators are not supported in let chain expressions --> src/main.rs:2:24 | 2 | if let true = true || false {} | ``` **After** ```rust error: `||` operators are not supported in let chain conditions --> src/main.rs:2:24 | 2 | if let true = true || false {} | ^^ ``` **Implementation details** 1. Added new `OrInLetChain` diagnostic in errors.rs 2. Modified `CondChecker` in expr.rs to prioritize the `||` error 3. Updated fluent message definitions to use clearer wording **Related issue** Fixes rust-lang#140263 cc ``@ehuss`` (issue author)

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#139865 (Stabilize proc_macro::Span::{start,end,line,column}.) - rust-lang#140086 (If creating a temporary directory fails with permission denied then retry with backoff) - rust-lang#140216 (Document that "extern blocks must be unsafe" in Rust 2024) - rust-lang#140253 (Add XtensaAsmPrinter) - rust-lang#140272 (Improve error message for `||` (or) in let chains) - rust-lang#140305 (Track per-obligation recursion depth only if there is inference in the new solver) - rust-lang#140306 (handle specialization in the new trait solver) - rust-lang#140308 (stall generator witness obligations: add regression test) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#140272 - Kivooeo:new-fix-four, r=est31 Improve error message for `||` (or) in let chains **Description** This PR improves the error message when using `||` in an if let chain expression, addressing rust-lang#140263. **Changes** 1. Creates a dedicated error message specifically for `||` usage in let chains 2. Points the primary span directly at the `||` operator 3. Removes confusing secondary notes about "let statements" and unsupported contexts 5. Adds UI tests verifying the new error message and valid cases **Before** ```rust error: expected expression, found let statement --> src/main.rs:2:8 | 2 | if let true = true || false {} | ^^^^^^^^^^^^^^^ | = note: only supported directly in conditions of if and while expressions note: || operators are not supported in let chain expressions --> src/main.rs:2:24 | 2 | if let true = true || false {} | ``` **After** ```rust error: `||` operators are not supported in let chain conditions --> src/main.rs:2:24 | 2 | if let true = true || false {} | ^^ ``` **Implementation details** 1. Added new `OrInLetChain` diagnostic in errors.rs 2. Modified `CondChecker` in expr.rs to prioritize the `||` error 3. Updated fluent message definitions to use clearer wording **Related issue** Fixes rust-lang#140263 cc ```@ehuss``` (issue author)

rustbot assigned SparrowLii Apr 24, 2025

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 Apr 24, 2025

est31 reviewed Apr 24, 2025

View reviewed changes

tests/ui/parser/or-in-let-chain.rs Show resolved Hide resolved

Kivooeo force-pushed the new-fix-four branch from 50a6e46 to 7e1482d Compare April 25, 2025 10:55

This comment has been minimized.

Sign in to view

Kivooeo force-pushed the new-fix-four branch from 7e1482d to b058489 Compare April 25, 2025 11:11

rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 25, 2025

This comment was marked as off-topic.

Sign in to view

Kivooeo force-pushed the new-fix-four branch 2 times, most recently from 0646f15 to 3d37216 Compare April 25, 2025 11:12

jieyouxu removed T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-compiletest Area: The compiletest test runner labels Apr 25, 2025

This comment has been minimized.

Sign in to view

resolved conflict

f072d30

Kivooeo force-pushed the new-fix-four branch from c7043d7 to f072d30 Compare April 25, 2025 12:03

est31 reviewed Apr 25, 2025

View reviewed changes

compiler/rustc_parse/messages.ftl Show resolved Hide resolved

est31 approved these changes Apr 25, 2025

View reviewed changes

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 Apr 25, 2025

matthiaskrgr mentioned this pull request Apr 25, 2025

Rollup of 9 pull requests #140315

Closed

jhpratt mentioned this pull request Apr 26, 2025

Rollup of 14 pull requests #140321

Closed

matthiaskrgr mentioned this pull request Apr 26, 2025

Rollup of 8 pull requests #140324

Merged

bors merged commit 6f6fa0f into rust-lang:master Apr 26, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 26, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Improve error message for `||` (or) in let chains #140272

Improve error message for `||` (or) in let chains #140272

Uh oh!

Kivooeo commented Apr 24, 2025 •

edited

Loading

Uh oh!

rustbot commented Apr 24, 2025

Uh oh!

Kivooeo commented Apr 24, 2025 •

edited

Loading

Uh oh!

Uh oh!

This comment has been minimized.

This comment was marked as off-topic.

This comment has been minimized.

Uh oh!

est31 commented Apr 25, 2025

Uh oh!

bors commented Apr 25, 2025

Uh oh!

Uh oh!

Uh oh!

Improve error message for || (or) in let chains #140272

Improve error message for || (or) in let chains #140272

Uh oh!

Conversation

Kivooeo commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 24, 2025

Uh oh!

Kivooeo commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment was marked as off-topic.

This comment has been minimized.

Uh oh!

est31 commented Apr 25, 2025

Uh oh!

bors commented Apr 25, 2025

Uh oh!

Uh oh!

Uh oh!

Improve error message for `||` (or) in let chains #140272

Improve error message for `||` (or) in let chains #140272

Kivooeo commented Apr 24, 2025 •

edited

Loading

Kivooeo commented Apr 24, 2025 •

edited

Loading