Add long error explanation for E0697#65215
Merged
bors merged 2 commits intorust-lang:masterfrom Oct 14, 2019
Merged
Conversation
Contributor
|
Some changes occurred in diagnostic error codes |
rust-highfive
added
the
S-waiting-on-review
100 tasks
Collaborator
|
☔ The latest upstream changes (presumably #65223) made this pull request unmergeable. Please resolve the merge conflicts. |
JohnTitor
force-pushed
the
long-explanation-e0697
branch
2 times, most recently
from
8f28742 to
4f5c49f
Compare
JohnTitor
force-pushed
the
long-explanation-e0697
branch
from
4f5c49f to
e0ef776
Compare
GuillaumeGomez
approved these changes
Oct 11, 2019
Member
|
Since I'm not a native english speaker, I'd just like to have someone else to confirm I didn't miss something but otherwise looks good to me! cc @kinnison |
kinnison
reviewed
Oct 12, 2019
kinnison
approved these changes
Oct 13, 2019
Contributor
kinnison
left a comment
kinnison
left a comment
There was a problem hiding this comment.
This replacement text now LGTM. 👍
Member
|
@bors: r+ rollup |
Collaborator
|
📌 Commit c6cc29d has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Oct 14, 2019
…=GuillaumeGomez Add long error explanation for E0697 Part of rust-lang#61137 r? @GuillaumeGomez
Centril
added a commit
to Centril/rust
that referenced
this pull request
Oct 14, 2019
…=GuillaumeGomez Add long error explanation for E0697 Part of rust-lang#61137 r? @GuillaumeGomez
bors
added a commit
that referenced
this pull request
Oct 14, 2019
Rollup of 7 pull requests Successful merges: - #65215 (Add long error explanation for E0697) - #65292 (Print lifetimes with backticks) - #65362 (syntax: consolidate function parsing in item.rs) - #65363 (Remove implicit dependencies on syntax::pprust) - #65379 (refactor session::config::build_session_options_and_crate_config) - #65392 (Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering) - #65395 (Add some tests for fixed ICEs) Failed merges: r? @ghost
bors
added a commit
that referenced
this pull request
Oct 14, 2019
Rollup of 7 pull requests Successful merges: - #65215 (Add long error explanation for E0697) - #65292 (Print lifetimes with backticks) - #65362 (syntax: consolidate function parsing in item.rs) - #65363 (Remove implicit dependencies on syntax::pprust) - #65379 (refactor session::config::build_session_options_and_crate_config) - #65392 (Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering) - #65395 (Add some tests for fixed ICEs) Failed merges: r? @ghost
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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 #61137
r? @GuillaumeGomez