Lower const item RHS to const path even on stable

Author: camelid

compiler/rustc_ast_lowering/src/item.rs

@@ -199,7 +199,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     |this| {
                         let ty = this
                             .lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::ConstTy));
-                        let body = this.lower_const_item(body.as_deref().unwrap());
+                        let body = this.lower_anon_const_to_const_arg(body.as_deref().unwrap());
                         (ty, body)
                     },
                 );
@@ -484,16 +484,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
         }
     }
 
-    fn lower_const_item(&mut self, body: &AnonConst) -> &'hir hir::ConstArg<'hir> {
-        let mgca = self.tcx.features().min_generic_const_args();
-        if mgca && let Some(ct_arg) = self.try_lower_as_const_path(body) {
-            return ct_arg;
-        }
-        let anon = self.lower_anon_const_to_anon_const(body);
-        self.arena
-            .alloc(hir::ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Anon(anon) })
-    }
-
     #[instrument(level = "debug", skip(self))]
     fn lower_use_tree(
         &mut self,
@@ -800,7 +790,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     |this| {
                         let ty = this
                             .lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::ConstTy));
-                        let body = body.as_deref().map(|body| this.lower_const_item(body));
+                        let body =
+                            body.as_deref().map(|body| this.lower_anon_const_to_const_arg(body));
                         hir::TraitItemKind::Const(ty, body)
                     },
                 );
@@ -993,7 +984,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                         let ty = this
                             .lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::ConstTy));
                         this.lower_define_opaque(hir_id, &define_opaque);
-                        let body = this.lower_const_item(body.as_deref().unwrap());
+                        let body = this.lower_anon_const_to_const_arg(body.as_deref().unwrap());
                         hir::ImplItemKind::Const(ty, body)
                     },
                 ),

compiler/rustc_ast_lowering/src/lib.rs

@@ -2084,22 +2084,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         }
     }
 
-    /// Assumes mgca feature is enabled.
-    fn try_lower_as_const_path(&mut self, body: &AnonConst) -> Option<&'hir hir::ConstArg<'hir>> {
-        let ExprKind::Path(qself, path) = &body.value.kind else { return None };
-        let qpath = self.lower_qpath(
-            body.value.id,
-            qself,
-            path,
-            ParamMode::Optional,
-            AllowReturnTypeNotation::No,
-            ImplTraitContext::Disallowed(ImplTraitPosition::Path),
-            None,
-        );
-        let ct_kind = hir::ConstArgKind::Path(qpath);
-        Some(self.arena.alloc(hir::ConstArg { hir_id: self.next_id(), kind: ct_kind }))
-    }
-
     /// Used when lowering a type argument that turned out to actually be a const argument.
     ///
     /// Only use for that purpose since otherwise it will create a duplicate def.