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 E0587 #65563

Merged
merged 2 commits into from
Oct 29, 2019

Conversation

GuillaumeGomez
Copy link
Member

Part of #61137.

r? @kinnison

@@ -3891,6 +3891,25 @@ details.
[issue #33685]: https://github.com/rust-lang/rust/issues/33685
"##,

E0587: r##"
A type has conflicting packed and align representation hints.
Copy link
Contributor

Choose a reason for hiding this comment

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

The word conflicting here suggests that the hints are in conflict by value rather than inherently because they conflict by mere existence. It may be better to simplify this sentence thusly:

Suggested change
A type has conflicting packed and align representation hints.
A type has both `packed` and `align` representation hints.

And then allow the subsequent paragraph to explain that you can't have them

src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
@JohnTitor JohnTitor added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 19, 2019
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
src/librustc_typeck/error_codes.rs Outdated Show resolved Hide resolved
@Dylan-DPC-zz
Copy link

r? @Dylan-DPC

@GuillaumeGomez
Copy link
Member Author

Updated!

@bors
Copy link
Contributor

bors commented Oct 23, 2019

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

@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 26, 2019
@JohnCSimon
Copy link
Member

Ping form triage - this looks like it's ready for review
@Dylan-DPC can you please review?
cc: @GuillaumeGomez

Thanks!

@Dylan-DPC-zz
Copy link

Thanks @JohnCSimon

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 28, 2019

📌 Commit 42a805e 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 28, 2019
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 28, 2019
…-E0587, r=Dylan-DPC

Add long error explanation for E0587

Part of rust-lang#61137.

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

Add long error explanation for E0587

Part of rust-lang#61137.

r? @kinnison
bors added a commit that referenced this pull request Oct 28, 2019
Rollup of 9 pull requests

Successful merges:

 - #65563 (Add long error explanation for E0587)
 - #65640 (Use heuristics to recover parsing of missing `;`)
 - #65643 (Correct handling of type flags with `ConstValue::Placeholder`)
 - #65825 (rustc: use IndexVec<DefIndex, T> instead of Vec<T>.)
 - #65858 (suggest `const_in_array_repeat_expression` flag)
 - #65877 (doc: introduce `once` in `iter::chain` document)
 - #65887 (doc: mention `get(_mut)` in Vec)
 - #65891 (self-profiling: Record something more useful for crate metadata generation event.)
 - #65893 (Output previous stable  error messaging when using stable build.)

Failed merges:

r? @ghost
@bors bors merged commit 42a805e into rust-lang:master Oct 29, 2019
@GuillaumeGomez GuillaumeGomez deleted the long-err-explanation-E0587 branch October 29, 2019 12:40
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.

7 participants