@@ -109,6 +109,13 @@ ASTValidation::visit (AST::Trait &trait)
rust_error_at (trait.get_type_param_bounds ()[0]->get_locus (),
ErrorCode::E0568,
"auto traits cannot have super traits");
+ if (trait.has_trait_items ())
+ {
+ rust_error_at (trait.get_identifier ().get_locus (), ErrorCode::E0380,
+ "auto traits cannot have methods or associated items");
+ for (const auto &item : trait.get_trait_items ())
+ Error::Hint (item->get_locus (), "remove this item").emit ();
+ }
}
AST::ContextualASTVisitor::visit (trait);
@@ -4989,18 +4989,6 @@ Parser<ManagedTokenSource>::parse_trait (AST::Visibility vis,
return nullptr;
}
- if (is_auto_trait && !trait_items.empty ())
- {
- add_error (Error (locus, ErrorCode::E0380,
- "auto traits cannot have associated items"));
-
- // FIXME: unsure if this should be done at parsing time or not
- for (const auto &item : trait_items)
- add_error (Error::Hint (item->get_locus (), "remove this item"));
-
- return nullptr;
- }
-
trait_items.shrink_to_fit ();
return std::unique_ptr<AST::Trait> (
new AST::Trait (std::move (ident), is_unsafe, is_auto_trait,
@@ -2,7 +2,9 @@
#![feature(optin_builtin_traits)]
-unsafe auto trait Invalid { // { dg-error "auto traits cannot have associated items" }
+auto trait Invalid {
+ // { dg-error "auto traits cannot have methods or associated items" "" { target *-*-* } .-1 }
+
fn foo(); // { dg-message "remove this item" }
fn bar() {} // { dg-message "remove this item" }
@@ -13,4 +15,3 @@ unsafe auto trait Invalid { // { dg-error "auto traits cannot have associated it
const BAR: i32 = 15; // { dg-message "remove this item" }
}
-// { dg-error "failed to parse item in crate" "" {target *-*-* } .+1 }