Remove 'Trait' suffix on function traits

Author: Aaron1011

chalk-integration/src/lowering.rs

@@ -1824,9 +1824,9 @@ impl LowerWellKnownTrait for WellKnownTrait {
             Self::Copy => rust_ir::WellKnownTrait::Copy,
             Self::Clone => rust_ir::WellKnownTrait::Clone,
             Self::Drop => rust_ir::WellKnownTrait::Drop,
-            Self::FnOnceTrait => rust_ir::WellKnownTrait::FnOnceTrait,
-            Self::FnMutTrait => rust_ir::WellKnownTrait::FnMutTrait,
-            Self::FnTrait => rust_ir::WellKnownTrait::FnTrait,
+            Self::FnOnce => rust_ir::WellKnownTrait::FnOnce,
+            Self::FnMut => rust_ir::WellKnownTrait::FnMut,
+            Self::Fn => rust_ir::WellKnownTrait::Fn,
         }
     }
 }

chalk-parse/src/ast.rs

@@ -68,9 +68,9 @@ pub enum WellKnownTrait {
     Copy,
     Clone,
     Drop,
-    FnOnceTrait,
-    FnMutTrait,
-    FnTrait,
+    FnOnce,
+    FnMut,
+    Fn,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]

chalk-parse/src/parser.lalrpop

@@ -51,9 +51,9 @@ WellKnownTrait: WellKnownTrait = {
      "#" "[" "lang" "(" "copy" ")" "]" => WellKnownTrait::Copy,
      "#" "[" "lang" "(" "clone" ")" "]" => WellKnownTrait::Clone,
      "#" "[" "lang" "(" "drop" ")" "]" => WellKnownTrait::Drop,
-     "#" "[" "lang" "(" "fn_once" ")" "]" => WellKnownTrait::FnOnceTrait,
-     "#" "[" "lang" "(" "fn_mut" ")" "]" => WellKnownTrait::FnMutTrait,
-     "#" "[" "lang" "(" "fn" ")" "]" => WellKnownTrait::FnTrait,
+     "#" "[" "lang" "(" "fn_once" ")" "]" => WellKnownTrait::FnOnce,
+     "#" "[" "lang" "(" "fn_mut" ")" "]" => WellKnownTrait::FnMut,
+     "#" "[" "lang" "(" "fn" ")" "]" => WellKnownTrait::Fn,
 };
 
 StructDefn: StructDefn = {

chalk-solve/src/clauses/builtin_traits.rs

@@ -33,7 +33,7 @@ pub fn add_builtin_program_clauses<I: Interner>(
             WellKnownTrait::Sized => sized::add_sized_program_clauses(db, builder, &trait_ref, ty),
             WellKnownTrait::Copy => copy::add_copy_program_clauses(db, builder, &trait_ref, ty),
             WellKnownTrait::Clone => clone::add_clone_program_clauses(db, builder, &trait_ref, ty),
-            WellKnownTrait::FnOnceTrait | WellKnownTrait::FnMutTrait | WellKnownTrait::FnTrait => {
+            WellKnownTrait::FnOnce | WellKnownTrait::FnMut | WellKnownTrait::Fn => {
                 fn_::add_fn_trait_program_clauses(db, builder, trait_ref.trait_id, ty, false)
             }
             // Drop impls are provided explicitly
@@ -51,7 +51,7 @@ pub fn add_builtin_assoc_program_clauses<I: Interner>(
     proj: &ProjectionTy<I>,
 ) {
     match well_known {
-        WellKnownTrait::FnOnceTrait => {
+        WellKnownTrait::FnOnce => {
             let interner = db.interner();
             let self_ty = proj
                 .substitution

chalk-solve/src/clauses/builtin_traits/fn_.rs

@@ -60,9 +60,9 @@ pub fn add_fn_trait_program_clauses<I: Interner>(
             let bound_ref = Binders::new(VariableKinds::from(interner, binders), new_trait_ref);
             builder.push_binders(&bound_ref, |this, inner_trait| {
                 if assoc_output {
-                    //The `Output` type is defined on the `FnOnceTrait`
+                    //The `Output` type is defined on the `FnOnce`
                     let fn_once = db.trait_datum(trait_id);
-                    assert_eq!(fn_once.well_known, Some(WellKnownTrait::FnOnceTrait));
+                    assert_eq!(fn_once.well_known, Some(WellKnownTrait::FnOnce));
                     let assoc_types = &fn_once.associated_ty_ids;
                     if assoc_types.len() != 1 {
                         panic!(

chalk-solve/src/rust_ir.rs

@@ -219,9 +219,9 @@ pub enum WellKnownTrait {
     /// The trait `FnOnce<Args>` - the generic argument `Args` is always a tuple
     /// corresponding to the arguments of a function implementing this trait.
     /// E.g. `fn(u8, bool): FnOnce<(u8, bool)>`
-    FnOnceTrait,
-    FnMutTrait,
-    FnTrait,
+    FnOnce,
+    FnMut,
+    Fn,
 }
 
 impl<I: Interner> TraitDatum<I> {

chalk-solve/src/wf.rs

@@ -474,9 +474,9 @@ impl WfWellKnownGoals {
             WellKnownTrait::Drop
             | WellKnownTrait::Clone
             | WellKnownTrait::Sized
-            | WellKnownTrait::FnOnceTrait
-            | WellKnownTrait::FnMutTrait
-            | WellKnownTrait::FnTrait => None,
+            | WellKnownTrait::FnOnce
+            | WellKnownTrait::FnMut
+            | WellKnownTrait::Fn => None,
         }
     }
 
@@ -492,9 +492,9 @@ impl WfWellKnownGoals {
         match db.trait_datum(impl_datum.trait_id()).well_known? {
             // You can't add a manual implementation of Sized
             WellKnownTrait::Sized
-            | WellKnownTrait::FnOnceTrait
-            | WellKnownTrait::FnMutTrait
-            | WellKnownTrait::FnTrait => Some(GoalData::CannotProve(()).intern(interner)),
+            | WellKnownTrait::FnOnce
+            | WellKnownTrait::FnMut
+            | WellKnownTrait::Fn => Some(GoalData::CannotProve(()).intern(interner)),
             WellKnownTrait::Drop => Self::drop_impl_constraint(db, impl_datum),
             WellKnownTrait::Copy | WellKnownTrait::Clone => None,
         }