Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Part of #61137.

@rust-highfive
Copy link
Contributor

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @zackmdavis

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

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

bors commented Oct 16, 2019

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

@GuillaumeGomez GuillaumeGomez force-pushed the long-err-explanation-E0575 branch from 6d49b11 to 585719d Compare October 16, 2019 09:08
@GuillaumeGomez
Copy link
Member Author

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.

Two possible language tweaks, otherwise good IMO.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think 'other' rather than 'else' would be better:

Something other than a type or an associated type was given.

Copy link
Contributor

Choose a reason for hiding this comment

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

I feel the repetition of 'in both cases' is clumsy. Perhaps:

In both cases we're declaring a variable (called _) and we're
stating what we believe to be a type. However, .......

?

@GuillaumeGomez GuillaumeGomez force-pushed the long-err-explanation-E0575 branch from 585719d to 367cda4 Compare October 16, 2019 11:54
@GuillaumeGomez
Copy link
Member Author

Updated.

@GuillaumeGomez
Copy link
Member Author

@bors: r=kinnison

@bors
Copy link
Collaborator

bors commented Oct 16, 2019

📌 Commit 367cda4 has been approved by kinnison

@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 16, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 16, 2019
…-E0575, r=kinnison Add long error explanation for E0575 Part of rust-lang#61137.
@bors
Copy link
Collaborator

bors commented Oct 17, 2019

☔ The latest upstream changes (presumably #65234) 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 17, 2019
@GuillaumeGomez GuillaumeGomez force-pushed the long-err-explanation-E0575 branch from 367cda4 to 21d9258 Compare October 17, 2019 09:31
@GuillaumeGomez
Copy link
Member Author

And here we go again!

@bors: r=kinnison

@bors
Copy link
Collaborator

bors commented Oct 17, 2019

📌 Commit 21d9258 has been approved by kinnison

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 17, 2019
@zackmdavis zackmdavis removed their assignment Oct 17, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 17, 2019
…-E0575, r=kinnison Add long error explanation for E0575 Part of rust-lang#61137.
tmandry added a commit to tmandry/rust that referenced this pull request Oct 18, 2019
…-E0575, r=kinnison Add long error explanation for E0575 Part of rust-lang#61137.
tmandry added a commit to tmandry/rust that referenced this pull request Oct 18, 2019
…-E0575, r=kinnison Add long error explanation for E0575 Part of rust-lang#61137.
tmandry added a commit to tmandry/rust that referenced this pull request Oct 18, 2019
…-E0575, r=kinnison Add long error explanation for E0575 Part of rust-lang#61137.
bors added a commit that referenced this pull request Oct 19, 2019
Rollup of 19 pull requests Successful merges: - #65016 (Always inline `mem::{size_of,align_of}` in debug builds) - #65197 (Prepare `MutVisitor`s to handle interned projections) - #65201 (Disable Go and OCaml bindings when building LLVM) - #65334 (Add long error explanation for E0575) - #65364 (Collect occurrences of empty blocks for mismatched braces diagnostic) - #65455 (Avoid unnecessary `TokenTree` to `TokenStream` conversions) - #65472 (Use a sharded dep node to dep node index map) - #65480 (Speed up `LexicalResolve::expansion()`) - #65493 (Add long error explanation for E0584) - #65496 (properly document panics in div_euclid and rem_euclid) - #65498 (Plugins deprecation: don’t suggest simply removing the attribute) - #65508 (add option to ping llvm ice-breakers to triagebot) - #65511 (save-analysis: Nest tables when processing impl block definitions) - #65513 (reorder fmt docs for more clarity) - #65532 (doc: make BitSet intro more short) - #65535 (rustc: arena-allocate the slice in `ty::GenericsPredicate`, not the whole struct.) - #65540 (show up some extra info when t!() fails) - #65549 (Fix left/right shift typo in wrapping rotate docs) - #65552 (Clarify diagnostics when using `~` as a unary op) Failed merges: - #65390 (Add long error explanation for E0576) - #65434 (Add long error explanation for E0577) - #65471 (Add long error explanation for E0578) r? @ghost
@bors bors merged commit 21d9258 into rust-lang:master Oct 19, 2019
@GuillaumeGomez GuillaumeGomez deleted the long-err-explanation-E0575 branch October 19, 2019 08:19
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.

5 participants