-
Notifications
You must be signed in to change notification settings - Fork 13.7k
AST validation: Improve handling of inherent impls nested within functions and anon consts #122004
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -930,35 +930,38 @@ impl<'a> Visitor<'a> for AstValidator<'a> { | |
| only_trait: only_trait.then_some(()), | ||
| }; | ||
|
|
||
| self.visibility_not_permitted( | ||
| &item.vis, | ||
| errors::VisibilityNotPermittedNote::IndividualImplItems, | ||
| ); | ||
| if let &Unsafe::Yes(span) = unsafety { | ||
| self.dcx().emit_err(errors::InherentImplCannotUnsafe { | ||
| span: self_ty.span, | ||
| annotation_span: span, | ||
| annotation: "unsafe", | ||
| self_ty: self_ty.span, | ||
| }); | ||
| } | ||
| if let &ImplPolarity::Negative(span) = polarity { | ||
| self.dcx().emit_err(error(span, "negative", false)); | ||
| } | ||
| if let &Defaultness::Default(def_span) = defaultness { | ||
| self.dcx().emit_err(error(def_span, "`default`", true)); | ||
| } | ||
| if let &Const::Yes(span) = constness { | ||
| self.dcx().emit_err(error(span, "`const`", true)); | ||
| } | ||
| self.with_in_trait_impl(None, |this| { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's not entirely clear why we're setting this for an inherent impl. Please leave detailed explanation for why. |
||
| this.visibility_not_permitted( | ||
| &item.vis, | ||
| errors::VisibilityNotPermittedNote::IndividualImplItems, | ||
| ); | ||
| if let &Unsafe::Yes(span) = unsafety { | ||
| this.dcx().emit_err(errors::InherentImplCannotUnsafe { | ||
| span: self_ty.span, | ||
| annotation_span: span, | ||
| annotation: "unsafe", | ||
| self_ty: self_ty.span, | ||
| }); | ||
| } | ||
| if let &ImplPolarity::Negative(span) = polarity { | ||
| this.dcx().emit_err(error(span, "negative", false)); | ||
| } | ||
| if let &Defaultness::Default(def_span) = defaultness { | ||
| this.dcx().emit_err(error(def_span, "`default`", true)); | ||
| } | ||
| if let &Const::Yes(span) = constness { | ||
| this.dcx().emit_err(error(span, "`const`", true)); | ||
| } | ||
|
|
||
| self.visit_vis(&item.vis); | ||
| self.visit_ident(item.ident); | ||
| self.with_tilde_const(Some(DisallowTildeConstContext::Impl(item.span)), |this| { | ||
| this.visit_generics(generics) | ||
| this.visit_vis(&item.vis); | ||
| this.visit_ident(item.ident); | ||
| this.with_tilde_const( | ||
| Some(DisallowTildeConstContext::Impl(item.span)), | ||
| |this| this.visit_generics(generics), | ||
| ); | ||
| this.visit_ty(self_ty); | ||
| walk_list!(this, visit_assoc_item, items, AssocCtxt::Impl); | ||
| }); | ||
| self.visit_ty(self_ty); | ||
| walk_list!(self, visit_assoc_item, items, AssocCtxt::Impl); | ||
| walk_list!(self, visit_attribute, &item.attrs); | ||
| return; // Avoid visiting again. | ||
| } | ||
|
|
||
35 changes: 35 additions & 0 deletions
tests/ui/parser/impls-nested-within-anon-consts-semantic.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // Regression test for issue #89342 and for part of #119924. | ||
| //@ check-pass | ||
|
|
||
| struct Expr<const N: u32>; | ||
|
|
||
| trait Trait0 { | ||
| fn required(_: Expr<{ | ||
| struct Type; | ||
|
|
||
| impl Type { | ||
| // This visibility qualifier used to get rejected. | ||
| pub fn perform() {} | ||
| } | ||
|
|
||
| 0 | ||
| }>); | ||
| } | ||
|
|
||
| trait Trait1 {} | ||
|
|
||
| impl Trait1 for () | ||
| where | ||
| [(); { | ||
| struct Type; | ||
|
|
||
| impl Type { | ||
| // This visibility qualifier used to get rejected. | ||
| pub const STORE: Self = Self; | ||
| } | ||
|
|
||
| 0 | ||
| }]: | ||
| {} | ||
|
|
||
| fn main() {} |
15 changes: 15 additions & 0 deletions
tests/ui/parser/impls-nested-within-fns-semantic-0.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Regression test for #121607 and for part of issue #119924. | ||
| //@ check-pass | ||
|
|
||
| trait Trait { | ||
| fn provided() { | ||
| pub struct Type; | ||
|
|
||
| impl Type { | ||
| // This visibility qualifier used to get rejected. | ||
| pub fn perform() {} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn main() {} |
22 changes: 22 additions & 0 deletions
tests/ui/parser/impls-nested-within-fns-semantic-1.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // Regression test for part of issue #119924. | ||
| //@ check-pass | ||
|
|
||
| #![feature(const_trait_impl, effects)] | ||
|
|
||
| #[const_trait] | ||
| trait Trait { | ||
| fn required(); | ||
| } | ||
|
|
||
| impl const Trait for () { | ||
| fn required() { | ||
| pub struct Type; | ||
|
|
||
| impl Type { | ||
| // This visibility qualifier used to get rejected. | ||
| pub fn perform() {} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn main() {} |
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.