Include whitespace in "remove |" suggestion and make it hidden #137872
+2,095
−969
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Better track trailing commas in match arms. Do not suggest adding trailing comma to match arm with block body. Better heuristic for "is this match in one line".
When encountering an unreachable match arm, (correctly) suggest removing the entire arm:
```
error: a never pattern is always unreachable
--> $DIR/ICE-130779-never-arm-no-oatherwise-block.rs:10:20
|
LL | Some(!) if true => {}
| ^^ this will never be executed
|
help: remove the unreachable match arm
|
LL - Some(!) if true => {}
LL + Some(!),
|
```
Noticed in rust-lang#137343 (comment).
```
error[E0004]: non-exhaustive patterns: `u8::MAX` not covered
--> $DIR/exhaustiveness.rs:47:8
|
LL | m!(0u8, 0..255);
| ^^^ pattern `u8::MAX` not covered
|
= note: the matched value is of type `u8`
note: within macro `m`, this `match` expression doesn't expand to cover all patterns
--> $DIR/exhaustiveness.rs:7:9
|
LL | / macro_rules! m {
LL | | ($s:expr, $($t:tt)+) => {
LL | | match $s { $($t)+ => {} }
| | ^^^^^^^^^^^^^^^^^^^^^^^^^
LL | | }
LL | | }
| |_-
= help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern
```
Parentheses surrounding patterns are not ketp in the HIR (and are warned against in the AST). In order to avoid having some suggestions break, we keep the outer span (including parentheses) when lowering the patterns.
```
error: a never pattern is always unreachable
--> $DIR/ICE-133117-duplicate-never-arm.rs:9:26
|
LL | (!|!) if true => {}
| ^^ this will never be executed
|
help: remove the match arm expression
|
LL - (!|!) if true => {}
LL + (!|!),
|
```
```
error[E0308]: mismatched types
--> $DIR/well-typed-edition-2024.rs:135:15
|
LL | let [&mut &(mut x)] = &mut [&0];
| ^^^^^^^^ --------- this expression has type `&mut [&{integer}; 1]`
| |
| expected integer, found `&_`
|
= note: expected type `{integer}`
found reference `&_`
help: consider removing `&` from the pattern
|
LL - let [&mut &(mut x)] = &mut [&0];
LL + let [&mut (mut x)] = &mut [&0];
|
```
```
error: a never pattern is always unreachable
--> $DIR/pattern-behind-macro.rs:13:21
|
LL | never!() => {}
| ^^ this will never be executed
|
help: remove the match arm expression
|
LL - never!() => {}
LL + never!(),
|
```
Look up the macro backtrace call sites to see if we find where the macro was used as a pattern, to properly suggest removing match arm guard and body.
|
r? @fee1-dead rustbot has assigned @fee1-dead. Use |
|
Some changes occurred in match checking cc @Nadrieril Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
rustbot
added
S-waiting-on-review
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
I believe this is still waiting on adding a tracking issue for majorly refactoring diagnostic suggestion styles that I asked for in #t-compiler/wg-diagnostics > Why are we making suggestions verbose? @ 💬 @rustbot author |
rustbot
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #124141) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tweak error rendering of patterns with an extra
|on either end.Built on #137409. Only last commit is relevant.
? @compiler-errors