Skip to content

Point at enclosing match when expecting () in arm - #64825

Merged
bors merged 3 commits into
rust-lang:masterfrom
estebank:match-unit
Sep 29, 2019
Merged

Point at enclosing match when expecting () in arm#64825
bors merged 3 commits into
rust-lang:masterfrom
estebank:match-unit

Conversation

@estebank

@estebankestebank commented Sep 27, 2019

Copy link
Copy Markdown
Contributor

When encountering code like the following:

fnmain(){match3{4 => 1,3 => {println!("Yep it maches.");2}
_ => 2}println!("Bye!")}

point at the enclosing match expression and suggest ignoring the
returned value:

error[E0308]: mismatched types
--> $DIR/match-needing-semi.rs:8:13
|
LL | / match 3 {
LL | | 4 => 1,
LL | | 3 => {
LL | | 2
| | ^ expected (), found integer
LL | | }
LL | | _ => 2
LL | | }
| | -- help: consider using a semicolon here
| |_____|
| expected this to be `()`
|
= note: expected type `()`
found type `{integer}

Fix#40799.

@rust-highfive

rust-highfive commented Sep 27, 2019

Copy link
Copy Markdown
Contributor

r? @zackmdavis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2019
@estebank

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
Centril
Centril reviewed Sep 27, 2019
View reviewed changes
Comment threadsrc/librustc/hir/map/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/coercion.rs Outdated
Comment threadsrc/librustc_typeck/check/mod.rs Outdated
Comment threadsrc/librustc_typeck/check/coercion.rs Outdated
Comment threadsrc/test/ui/suggestions/match-needing-semi.fixed Outdated
@estebank
estebankforce-pushed the match-unit branch 3 times, most recently from 1d90402 to 8a508ceCompareSeptember 28, 2019 01:49
@estebank
Point at enclosing match when expecting () in arm
8a167ed
When encountering code like the following:
```rust
fn main() {
match 3 {
4 => 1,
3 => {
println!("Yep it maches.");
2
}
_ => 2
}
println!("Bye!")
}
```
point at the enclosing `match` expression and suggest ignoring the
returned value:
```
error[E0308]: mismatched types
--> $DIR/match-needing-semi.rs:8:13
|
LL | / match 3 {
LL | | 4 => 1,
LL | | 3 => {
LL | | 2
| | ^ expected (), found integer
LL | | }
LL | | _ => 2
LL | | }
| | -- help: consider using a semicolon here
| |_____|
| expected this to be `()`
|
= note: expected type `()`
found type `{integer}
```
Fixrust-lang#40799.
@estebank
review comments
ae51953
@estebank
clean up
c861e24
@Centril

Centril commented Sep 29, 2019

Copy link
Copy Markdown
Contributor

r? @Centril@bors r+

@bors

bors commented Sep 29, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit c861e24 has been approved by Centril

@borsbors 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 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 29, 2019
@Centril
Rollup merge ofrust-lang#64825- estebank:match-unit, r=Centril
8c3fd1c
Point at enclosing match when expecting `()` in arm
When encountering code like the following:
```rust
fn main() {
match 3 {
4 => 1,
3 => {
println!("Yep it maches.");
2
}
_ => 2
}
println!("Bye!")
}
```
point at the enclosing `match` expression and suggest ignoring the
returned value:
```
error[E0308]: mismatched types
--> $DIR/match-needing-semi.rs:8:13
|
LL | / match 3 {
LL | | 4 => 1,
LL | | 3 => {
LL | | 2
| | ^ expected (), found integer
LL | | }
LL | | _ => 2
LL | | }
| | -- help: consider using a semicolon here
| |_____|
| expected this to be `()`
|
= note: expected type `()`
found type `{integer}
```
Fixrust-lang#40799.
@CentrilCentril mentioned this pull request Sep 29, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 29, 2019
@Centril
Rollup merge ofrust-lang#64825- estebank:match-unit, r=Centril
8109332
Point at enclosing match when expecting `()` in arm
When encountering code like the following:
```rust
fn main() {
match 3 {
4 => 1,
3 => {
println!("Yep it maches.");
2
}
_ => 2
}
println!("Bye!")
}
```
point at the enclosing `match` expression and suggest ignoring the
returned value:
```
error[E0308]: mismatched types
--> $DIR/match-needing-semi.rs:8:13
|
LL | / match 3 {
LL | | 4 => 1,
LL | | 3 => {
LL | | 2
| | ^ expected (), found integer
LL | | }
LL | | _ => 2
LL | | }
| | -- help: consider using a semicolon here
| |_____|
| expected this to be `()`
|
= note: expected type `()`
found type `{integer}
```
Fixrust-lang#40799.
@CentrilCentril mentioned this pull request Sep 29, 2019
Merged
bors added a commit that referenced this pull request Sep 29, 2019
@bors
Auto merge of#64902- Centril:rollup-1i431vs, r=Centril
8431f26
Rollup of 6 pull requests
Successful merges:
- #64691 (Point at definition when misusing ADT)
- #64735 (Add long error explanation for E0533)
- #64825 (Point at enclosing match when expecting `()` in arm)
- #64858 (Add support for relating slices in `super_relate_consts`)
- #64894 (syntax: fix dropping of attribute on first param of non-method assocated fn)
- #64898 (fixed typo)
Failed merges:
r? @ghost
@bors
bors merged commit c861e24 into rust-lang:masterSep 29, 2019
@Manishearth

Manishearth commented Oct 1, 2019

Copy link
Copy Markdown
Member

So this is breaking clippy tests since we rely on this span to test if for loops are coming from a macro. Might be able to work around this, but it could be tricky.

@Manishearth

Manishearth commented Oct 1, 2019

Copy link
Copy Markdown
Member

Ah, figured it out.

This was referenced Oct 1, 2019
Closed
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Oct 1, 2019
@bors
Auto merge of#4604- Manishearth:rustup, r=yaahc
c06f8d0
Rustup to rustc 1.40.0-nightly (702b45e 2019-10-01)
Broken by rust-lang/rust#64825
r? @yaahc@phansch
bors added a commit to rust-lang/rust-clippy that referenced this pull request Oct 1, 2019
@bors
Auto merge of#4604- Manishearth:rustup, r=yaahc
ff3a703
Rustup to rustc 1.40.0-nightly (702b45e 2019-10-01)
Broken by rust-lang/rust#64825
r? @yaahc@phansch
@estebank

estebank commented Oct 1, 2019

Copy link
Copy Markdown
ContributorAuthor

Cool!

bors added a commit to rust-lang/rust-clippy that referenced this pull request Oct 1, 2019
@bors
Auto merge of#4604- Manishearth:rustup, r=yaahc
8ec2d1c
Rustup to rustc 1.40.0-nightly (702b45e 2019-10-01)
Broken by rust-lang/rust#64825
changelog: none
r? @yaahc@phansch
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Incorrect parser error when match statement is missing its ;

6 participants

@estebank@rust-highfive@Centril@bors@Manishearth@zackmdavis