Skip to content

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Oct 22, 2019

Fixes #65571

r? @Centril

@rust-highfive
Copy link
Contributor

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 22, 2019
@Dylan-DPC-zz
Copy link

r? @dylan DPC

@Dylan-DPC-zz
Copy link

damn..

r? @Dylan-DPC

@JohnTitor
Copy link
Member

@GuillaumeGomez I think the issue number we should close is #65571, not #65577.

@GuillaumeGomez
Copy link
Member Author

@JohnTitor Absolutely! Good catch! I updated the comment.

@Dylan-DPC-zz
Copy link

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 23, 2019

📌 Commit ed965f1 has been approved by Dylan-DPC

@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 23, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 23, 2019
…r=Dylan-DPC

Update E0659 error code long explanation to 2018 edition

Fixes rust-lang#65571

r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Oct 23, 2019
…r=Dylan-DPC

Update E0659 error code long explanation to 2018 edition

Fixes rust-lang#65571

r? @Centril
bors added a commit that referenced this pull request Oct 24, 2019
Rollup of 12 pull requests

Successful merges:

 - #64178 (More Clippy fixes for alloc, core and std)
 - #65144 (Add Cow::is_borrowed and Cow::is_owned)
 - #65193 (Lockless LintStore)
 - #65479 (Add the `matches!( $expr, $pat ) -> bool` macro)
 - #65518 (Avoid ICE when checking `Destination` of `break` inside a closure)
 - #65583 (rustc_metadata: use a table for super_predicates, fn_sig, impl_trait_ref.)
 - #65641 (Derive `Rustc{En,De}codable` for `TokenStream`.)
 - #65648 (Eliminate `intersect_opt`.)
 - #65657 (Remove `InternedString`)
 - #65691 (Update E0659 error code long explanation to 2018 edition)
 - #65696 (Fix an issue with const inference variables sticking around under Chalk + NLL)
 - #65704 (relax ExactSizeIterator bound on write_bytes)

Failed merges:

r? @ghost
@bors bors merged commit ed965f1 into rust-lang:master Oct 24, 2019
@bors
Copy link
Collaborator

bors commented Oct 24, 2019

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2019
@GuillaumeGomez GuillaumeGomez deleted the 2018-edition-E0659 branch October 25, 2019 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Outdated --explain examples for E0659 "An item usage is ambiguous."
6 participants