do use ty::Const in patterns and abstract consts

compiler/rustc_trait_selection/src/traits/const_evaluatable.rs

@@ -37,14 +37,9 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
     param_env: ty::ParamEnv<'tcx>,
     span: Span,
 ) -> Result<(), NotConstEvaluatable> {
-<<<<<<< HEAD
     let tcx = infcx.tcx;
 
     if tcx.features().generic_const_exprs {
-=======
-    if infcx.tcx.features().generic_const_exprs {
-        let tcx = infcx.tcx;
->>>>>>> 6064f16d846 (change thir to use mir::ConstantKind instead of ty::Const)
         match AbstractConst::new(tcx, uv)? {
             // We are looking at a generic abstract constant.
             Some(ct) => {
@@ -249,7 +244,7 @@ impl<'tcx> AbstractConst<'tcx> {
         Ok(inner.map(|inner| AbstractConst { inner, substs: uv.substs }))
     }
 
-    pub fn from_constant(
+    pub fn from_const(
         tcx: TyCtxt<'tcx>,
         ct: ty::Const<'tcx>,
     ) -> Result<Option<AbstractConst<'tcx>>, ErrorGuaranteed> {
@@ -382,6 +377,10 @@ impl<'a, 'tcx> AbstractConstBuilder<'a, 'tcx> {
                 }
             }
 
+            fn visit_const(&mut self, ct: ty::Const<'tcx>) {
+                self.is_poly |= ct.has_param_types_or_consts();
+            }
+
             fn visit_constant(&mut self, ct: mir::ConstantKind<'tcx>) {
                 self.is_poly |= ct.has_param_types_or_consts();
             }
@@ -423,10 +422,10 @@ impl<'a, 'tcx> AbstractConstBuilder<'a, 'tcx> {
         self.recurse_build(self.body_id)?;
 
         for n in self.nodes.iter() {
-            if let Node::Leaf(mir::ConstantKind::Ty(ty::Const(Interned(
+            if let Node::Leaf(ty::Const(Interned(
                 ty::ConstS { val: ty::ConstKind::Unevaluated(ct), ty: _ },
                 _,
-            )))) = n
+            ))) = n
             {
                 // `AbstractConst`s should not contain any promoteds as they require references which
                 // are not allowed.
@@ -863,4 +862,4 @@ impl<'tcx> ConstUnifyCtxt<'tcx> {
                     false
 >>>>>>> 6064f16d846 (change thir to use mir::ConstantKind instead of ty::Const)
 
- */
+ */