Uh oh!
There was an error while loading. Please reload this page.
Add long diagnostics for E0015 and E0020. - #24488
Closed
nham wants to merge 2 commits into
Closed
Conversation
rust-highfive
commented
Apr 16, 2015
Contributor
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
nhamforce-pushed
the
explain_check_const
branch
2 times, most recently
from
April 16, 2015 05:59
8a5238d to
62a73c0Comparemichaelsproul
commented
Apr 16, 2015
Contributor
Looks good to me 👍 |
alexcrichton
commented
Apr 16, 2015
Member
nham
commented
Apr 16, 2015
ContributorAuthor
Thanks, I've fixed the wording in E0015. |
alexcrichton
commented
Apr 16, 2015
Member
bors
commented
Apr 17, 2015
Collaborator
☔ The latest upstream changes (presumably #24512) made this pull request unmergeable. Please resolve the merge conflicts. |
nham
commented
Apr 17, 2015
ContributorAuthor
I rebased on top of master. |
alexcrichton
commented
Apr 17, 2015
Member
alexcrichton
commented
Apr 18, 2015
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
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.
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Part of #24407.