Handle matches added by rebase

Author: fee1-dead

compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs

@@ -618,7 +618,7 @@ impl<'a, 'tcx> FindInferSourceVisitor<'a, 'tcx> {
 
     /// Computes cost for the given source.
     ///
-    /// Sources with a small cost are prefer and should result
+    /// Sources with a small cost are preferred and should result
     /// in a clearer and idiomatic suggestion.
     fn source_cost(&self, source: &InferSource<'tcx>) -> usize {
         #[derive(Clone, Copy)]
@@ -631,6 +631,7 @@ impl<'a, 'tcx> FindInferSourceVisitor<'a, 'tcx> {
                     GenericArgKind::Lifetime(_) => 0, // erased
                     GenericArgKind::Type(ty) => self.ty_cost(ty),
                     GenericArgKind::Const(_) => 3, // some non-zero value
+                    GenericArgKind::Constness(_) => 1,
                 }
             }
             fn ty_cost(self, ty: Ty<'tcx>) -> usize {
@@ -748,6 +749,7 @@ impl<'a, 'tcx> FindInferSourceVisitor<'a, 'tcx> {
             }
             match inner.unpack() {
                 GenericArgKind::Lifetime(_) => {}
+                GenericArgKind::Constness(_) => {}
                 GenericArgKind::Type(ty) => {
                     if matches!(ty.kind(), ty::Opaque(..) | ty::Closure(..) | ty::Generator(..)) {
                         // Opaque types can't be named by the user right now.

compiler/rustc_middle/src/ty/generics.rs

@@ -78,7 +78,7 @@ impl GenericParamDef {
         match self.kind {
             GenericParamDefKind::Type { has_default, .. }
             | GenericParamDefKind::Const { has_default } => has_default,
-            GenericParamDefKind::Lifetime => false,
+            GenericParamDefKind::Lifetime | GenericParamDefKind::Constness => false,
         }
     }