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

Add long error explanation for E0697 #65215

Merged
merged 2 commits into from
Oct 14, 2019

Conversation

JohnTitor
Copy link
Member

Part of #61137

r? @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2019
@bors
Copy link
Contributor

bors commented Oct 9, 2019

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

@JohnTitor JohnTitor force-pushed the long-explanation-e0697 branch 2 times, most recently from 8f28742 to 4f5c49f Compare October 9, 2019 20:05
@JohnTitor JohnTitor force-pushed the long-explanation-e0697 branch from 4f5c49f to e0ef776 Compare October 10, 2019 23:24
@GuillaumeGomez
Copy link
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

Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

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

This replacement text now LGTM. 👍

@GuillaumeGomez
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Oct 13, 2019

📌 Commit c6cc29d has been approved by GuillaumeGomez

@bors bors 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 Oct 13, 2019
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
@bors bors merged commit c6cc29d into rust-lang:master Oct 14, 2019
@JohnTitor JohnTitor deleted the long-explanation-e0697 branch October 14, 2019 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants