Address some review comments

Author: camelid

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

@@ -23,16 +23,6 @@ use crate::hir_ty_lowering::{HirTyLowerer, PredicateFilter, RegionInferReason};
 /// inferred constraints concerning which regions outlive other regions.
 #[instrument(level = "debug", skip(tcx))]
 pub(super) fn predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericPredicates<'_> {
-    // Anon const as RHS of const item is the body, so should have the same predicates.
-    // FIXME(mgca): probably should have only the predicates of params that are explicitly referenced,
-    // as should generics_of (maybe only under mgca?)
-    if matches!(tcx.def_kind(def_id), DefKind::AnonConst)
-        && let parent = tcx.parent(def_id)
-        && matches!(tcx.def_kind(parent), DefKind::Const | DefKind::AssocConst)
-    {
-        return tcx.predicates_of(parent);
-    }
-
     let mut result = tcx.explicit_predicates_of(def_id);
     debug!("predicates_of: explicit_predicates_of({:?}) = {:?}", def_id, result);
 

compiler/rustc_hir_analysis/src/collect/type_of.rs

@@ -103,11 +103,11 @@ fn const_arg_anon_type_of<'tcx>(icx: &ItemCtxt<'tcx>, arg_hir_id: HirId, span: S
             icx.lower_ty(ty)
         }
 
-        Node::Item(hir::Item { kind: hir::ItemKind::Const(_, ty, ..), .. })
-        | Node::ImplItem(hir::ImplItem { kind: hir::ImplItemKind::Const(ty, ..), .. })
-        | Node::TraitItem(hir::TraitItem { kind: hir::TraitItemKind::Const(ty, ..), .. }) => {
-            icx.lower_ty(ty)
-        }
+        Node::Item(hir::Item { kind: hir::ItemKind::Const(..), owner_id, .. })
+        | Node::ImplItem(hir::ImplItem { kind: hir::ImplItemKind::Const(..), owner_id, .. })
+        | Node::TraitItem(hir::TraitItem {
+            kind: hir::TraitItemKind::Const(..), owner_id, ..
+        }) => tcx.type_of(owner_id.def_id).instantiate_identity(),
 
         // This is not a `bug!` as const arguments in path segments that did not resolve to anything
         // will result in `type_of` never being fed.