Add long error explanation for E0587#65563
Merged
bors merged 2 commits intorust-lang:masterfrom Oct 29, 2019
Merged
Conversation
100 tasks
kinnison
reviewed
Oct 18, 2019
src/librustc_typeck/error_codes.rs
Outdated
Contributor
There was a problem hiding this comment.
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
Centril
reviewed
Oct 21, 2019
|
r? @Dylan-DPC |
2aa6201 to
53a7c70
Compare
Member
Author
|
Updated! |
Collaborator
|
☔ The latest upstream changes (presumably #65716) made this pull request unmergeable. Please resolve the merge conflicts. |
53a7c70 to
42a805e
Compare
Member
|
Ping form triage - this looks like it's ready for review Thanks! |
|
Thanks @JohnCSimon @bors r+ rollup |
Collaborator
|
📌 Commit 42a805e has been approved by |
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
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
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? @kinnison