Emit ForbiddenBound when parsing

Author: mu001999

compiler/rustc_ast_passes/src/errors.rs

@@ -95,13 +95,6 @@ pub(crate) struct AsyncFnInConstTraitOrTraitImpl {
     pub const_keyword: Span,
 }
 
-#[derive(Diagnostic)]
-#[diag("bounds cannot be used in this context")]
-pub(crate) struct ForbiddenBound {
-    #[primary_span]
-    pub spans: Vec<Span>,
-}
-
 #[derive(Diagnostic)]
 #[diag("late-bound const parameters cannot be used currently")]
 pub(crate) struct ForbiddenConstParam {

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -143,13 +143,6 @@ impl<'a> PostExpansionVisitor<'a> {
                 self.sess.dcx().emit_err(errors::ForbiddenConstParam { const_param_spans });
             }
         }
-
-        for param in params {
-            if !param.bounds.is_empty() {
-                let spans: Vec<_> = param.bounds.iter().map(|b| b.span()).collect();
-                self.sess.dcx().emit_err(errors::ForbiddenBound { spans });
-            }
-        }
     }
 }
 

compiler/rustc_parse/src/errors.rs

@@ -4423,6 +4423,13 @@ pub(crate) struct MisspelledKw {
     pub is_incorrect_case: bool,
 }
 
+#[derive(Diagnostic)]
+#[diag("bounds cannot be used in this context")]
+pub(crate) struct ForbiddenBound {
+    #[primary_span]
+    pub spans: Vec<Span>,
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(super) enum TokenDescription {
     ReservedIdentifier,

compiler/rustc_parse/src/parser/ty.rs

@@ -1433,8 +1433,24 @@ impl<'a> Parser<'a> {
             self.expect_lt()?;
             let params = self.parse_generic_params()?;
             self.expect_gt()?;
+
+            // Parameters must not have bounds
+            let params = params
+                .into_iter()
+                .map(|mut param| {
+                    if param.bounds.is_empty() {
+                        param
+                    } else {
+                        let spans: Vec<_> = param.bounds.iter().map(|b| b.span()).collect();
+                        self.dcx().emit_err(errors::ForbiddenBound { spans });
+                        param.bounds.clear();
+                        param
+                    }
+                })
+                .collect::<ThinVec<_>>();
+
             // We rely on AST validation to rule out invalid cases: There must not be
-            // type or const parameters, and parameters must not have bounds.
+            // type or const parameters
             Ok((params, Some(lo.to(self.prev_token.span))))
         } else {
             Ok((ThinVec::new(), None))

tests/ui/traits/const-traits/conditionally-const-trait-bound-syntax.rs

@@ -5,5 +5,5 @@
 
 struct S<
     T: for<'a> [const] Tr<'a> + 'static + [const] std::ops::Add,
-    T: for<'a: 'b> [const] m::Trait<'a>,
+    T: for<'a> [const] m::Trait<'a>,
 >;

tests/ui/traits/non_lifetime_binders/bad-bounds.rs

@@ -0,0 +1,14 @@
+//@ edition: 2024
+
+#![feature(non_lifetime_binders)]
+#![expect(incomplete_features)]
+
+fn produce() -> for<A: A<{ //~ ERROR expected a type, found a trait
+    //~^ ERROR bounds cannot be used in this context
+    //~^^ ERROR late-bound type parameter not allowed on trait object types
+    #[derive(Hash)]
+    enum A {}
+    struct A<A>;
+}>> Trait {} //~ ERROR cannot find trait `Trait` in this scope
+
+fn main() {}

tests/ui/traits/non_lifetime_binders/bad-bounds.stderr

@@ -0,0 +1,42 @@
+error: bounds cannot be used in this context
+  --> $DIR/bad-bounds.rs:6:24
+   |
+LL |   fn produce() -> for<A: A<{
+   |  ________________________^
+LL | |
+LL | |
+LL | |     #[derive(Hash)]
+LL | |     enum A {}
+LL | |     struct A<A>;
+LL | | }>> Trait {}
+   | |__^
+
+error[E0405]: cannot find trait `Trait` in this scope
+  --> $DIR/bad-bounds.rs:12:5
+   |
+LL | }>> Trait {}
+   |     ^^^^^ not found in this scope
+
+error: late-bound type parameter not allowed on trait object types
+  --> $DIR/bad-bounds.rs:6:21
+   |
+LL | fn produce() -> for<A: A<{
+   |                     ^
+
+error[E0782]: expected a type, found a trait
+  --> $DIR/bad-bounds.rs:6:17
+   |
+LL |   fn produce() -> for<A: A<{
+   |  _________________^
+LL | |
+LL | |
+LL | |     #[derive(Hash)]
+LL | |     enum A {}
+LL | |     struct A<A>;
+LL | | }>> Trait {}
+   | |_________^
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0405, E0782.
+For more information about an error, try `rustc --explain E0405`.