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.

Sign up for GitHub

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

Jump to bottom

Add long diagnostics for E0015 and E0020. #24488

Closed
wants to merge 2 commits into from
Closed

Add long diagnostics for E0015 and E0020. #24488

wants to merge 2 commits into from

Conversation

nham
Copy link
Contributor

@nham nham commented Apr 16, 2015

Part of #24407.

@rust-highfive
Copy link
Collaborator

r? @brson

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

@nham nham force-pushed the explain_check_const branch 2 times, most recently from 8a5238d to 62a73c0 Compare April 16, 2015 05:59
@michaelsproul
Copy link
Contributor

Looks good to me 👍

@alexcrichton
Copy link
Member

Thanks @nham! r=me with @lfairy's comment

@nham nham force-pushed the explain_check_const branch from 62a73c0 to f043695 Compare April 16, 2015 17:44
@nham
Copy link
Contributor Author

nham commented Apr 16, 2015

Thanks, I've fixed the wording in E0015.

@alexcrichton
Copy link
Member

@bors: r+ f043695 rollup

@alexcrichton alexcrichton assigned alexcrichton and unassigned brson Apr 16, 2015
@steveklabnik steveklabnik mentioned this pull request Apr 16, 2015
Merged
bors added a commit that referenced this pull request Apr 16, 2015
@bors
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
fb4ab3b 
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
bors added a commit that referenced this pull request Apr 17, 2015
@bors
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
88773f4 
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
bors added a commit that referenced this pull request Apr 17, 2015
@bors
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
b7fb575 
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
@bors
Copy link
Contributor

bors commented Apr 17, 2015

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

@nham nham force-pushed the explain_check_const branch from f043695 to 8d795ef Compare April 17, 2015 17:12
@nham
Copy link
Contributor Author

nham commented Apr 17, 2015

I rebased on top of master.

@alexcrichton
Copy link
Member

@bors: r+ 8d795ef

@michaelsproul michaelsproul mentioned this pull request Apr 17, 2015
Merged
@alexcrichton
Copy link
Member

Closing in favor of the merged version at #24542

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 18, 2015
@Manishearth
Rollup merge of rust-lang#24542 - michaelsproul:rollup, r=alexcrichton
cb7a127 
I did a manual merge of all the extended error PRs as we were getting merge conflicts yesterday. I think this is preferable to merging separately as I ended up having to manually merge @nham and @GuillaumeGomez's commits.

Rollup of rust-lang#24458, rust-lang#24482 and rust-lang#24488.

rust-lang#24482 and rust-lang#24488 were already re-approved, and would need to be cancelled if this is merged instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nham @rust-highfive @michaelsproul @alexcrichton @bors @brson