syntax: Rewrite parsing of impls #46455
Merged
Conversation
This file contains 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
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
petrochenkov
commented
Dec 2, 2017
src/libsyntax/parse/parser.rs
Outdated
| } | ||
| if !impl_items.is_empty() { | ||
| self.span_err(impl_items[0].span, "auto impls cannot have impl items") | ||
| } |
There was a problem hiding this comment.
I didn't add new tests for all this stuff because impls for .. are going to be removed pretty soon.
There was a problem hiding this comment.
I think we can even do it now, if we do some more #[cfg(stage0)] stuff.
3 tasks
kennytm
added
the
S-waiting-on-review
nikomatsakis
approved these changes
Dec 6, 2017
src/librustc_typeck/check/wfcheck.rs
Outdated
| fn error_380(tcx: TyCtxt, span: Span) { | ||
| span_err!(tcx.sess, span, E0380, | ||
| "traits with default impls (`e.g. impl \ | ||
| "traits with auto impls (`e.g. impl \ |
There was a problem hiding this comment.
aren't these just called auto trait now or something? I thought we landed some such PR.
| @@ -69,6 +62,9 @@ impl<'cx, 'tcx, 'v> UnsafetyChecker<'cx, 'tcx> { | |||
| g.attr_name()); | |||
| } | |||
|
|
|||
| (_, _, Unsafety::Unsafe, hir::ImplPolarity::Negative) => { | |||
| // Reported in AST validation | |||
src/libsyntax/parse/parser.rs
Outdated
| } | ||
| if !impl_items.is_empty() { | ||
| self.span_err(impl_items[0].span, "auto impls cannot have impl items") | ||
| } |
There was a problem hiding this comment.
I think we can even do it now, if we do some more #[cfg(stage0)] stuff.
|
This PR is not super urgent, I'll merge it after #46480 lands. |
petrochenkov
added
S-blocked
kennytm
added
S-blocked
kennytm
added
S-blocked
|
☔ The latest upstream changes (presumably #46083) made this pull request unmergeable. Please resolve the merge conflicts. |
shepmaster
added
S-blocked
kennytm
added
S-blocked
Properly parse impls for the never type `!` Recover from missing `for` in `impl Trait for Type` Prohibit inherent default impls and default impls of auto traits Change wording in more diagnostics to use "auto traits" Some minor code cleanups in the parser
|
@bors r=nikomatsakis |
|
📌 Commit 60c48dd has been approved by |
bors
added a commit
that referenced
this pull request
Jan 14, 2018
syntax: Rewrite parsing of impls Properly parse impls for the never type `!` Recover from missing `for` in `impl Trait for Type` Prohibit inherent default impls and default impls of auto traits (#37653 (comment), #37653 (comment)) Change wording in more diagnostics to use "auto traits" Fix some spans in diagnostics Some other minor code cleanups in the parser Disambiguate generics and qualified paths in impls (parse `impl <Type as Trait>::AssocTy { ... }`) Replace the future-compatibility hack from #38268 with actually parsing generic parameters Add a test for #46438
|
|
||
| This will compile: | ||
|
|
||
| ```ignore (ignore auto_trait future compatibility warning) |
There was a problem hiding this comment.
this ignore can be removed
|
☀️ Test successful - status-appveyor, status-travis |
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.
Properly parse impls for the never type
!Recover from missing
forinimpl Trait for TypeProhibit inherent default impls and default impls of auto traits (#37653 (comment), #37653 (comment))
Change wording in more diagnostics to use "auto traits"
Fix some spans in diagnostics
Some other minor code cleanups in the parser
Disambiguate generics and qualified paths in impls (parse
impl <Type as Trait>::AssocTy { ... })Replace the future-compatibility hack from #38268 with actually parsing generic parameters
Add a test for #46438