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

Librustc_resolve diagnostics fixes #33493

Merged
merged 2 commits into from
May 10, 2016
Merged

Conversation

Manishearth
Copy link
Member

}
```


Copy link
Member

Choose a reason for hiding this comment

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

Extra empty line.

@GuillaumeGomez
Copy link
Member

cc #32777

let x = (0,2);
match x {
(0, ref y) | (y, 0) => { /* use y */} // error: variable `y` is bound with
// different mode in pattern #2 than
Copy link
Member

Choose a reason for hiding this comment

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

It shouldn't be aligned with "error:". If it is too long, write it to next line.

@bors
Copy link
Contributor

bors commented May 8, 2016

☔ The latest upstream changes (presumably #33494) made this pull request unmergeable. Please resolve the merge conflicts.

@Manishearth
Copy link
Member Author

addressed

Example of erroneous code:

```compile_fail
let x = (0,2);
Copy link
Member

Choose a reason for hiding this comment

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

You put a whitespace after the comma everywhere else. I think to be consistent you should put it here as well.

@GuillaumeGomez
Copy link
Member

Thanks!

r=me

@Manishearth
Copy link
Member Author

@bors r=GuillaumeGomez

@bors
Copy link
Contributor

bors commented May 8, 2016

📌 Commit a795419 has been approved by GuillaumeGomez

Manishearth added a commit to Manishearth/rust that referenced this pull request May 8, 2016
bors added a commit that referenced this pull request May 8, 2016
Rollup of 9 pull requests

- Successful merges: #32900, #33129, #33365, #33383, #33474, #33478, #33480, #33484, #33493
- Failed merges: #33360
```
let x = (0, 2);
match x {
(0, ref y) | (ref y, 0) => { /* use y */}
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

That's an ICE. I already filed it. We need to add "ignore" on this one or to find a workaround...

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. r?

(I didn't mention a bug number here since this is supposed to be read by the user. I've left a note on the ICE bug.)

@steveklabnik
Copy link
Member

@bors: r-

@GuillaumeGomez
Copy link
Member

Seems fixed. cc @steveklabnik

@Manishearth
Copy link
Member Author

@bors r+ p=20

@bors
Copy link
Contributor

bors commented May 9, 2016

📌 Commit 84843b7 has been approved by Manishearth

@Manishearth
Copy link
Member Author

@bors rollup p=0

oops

Manishearth added a commit to Manishearth/rust that referenced this pull request May 9, 2016
@bors bors merged commit 84843b7 into rust-lang:master May 10, 2016
@Manishearth Manishearth deleted the more-diag branch December 2, 2016 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants