bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Re-use constness_for_typeck instead of rolling it ourselves

Browse source
This commit is contained in:
Oli Scherer 2021-10-21 15:28:26 +00:00 • committed by Deadbeef
parent 1761d88f4a
commit e37947f097
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
2 changed files with 6 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_ty_utils/src/ty.rs
View file

@ -289,17 +289,7 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
let hir_id = local_did.map(|def_id| tcx.hir().local_def_id_to_hir_id(def_id));
let constness = match hir_id {
Some(hir_id) => match tcx.hir().opt_body_owner_kind(hir_id) {
Err(hir::Node::Item(&hir::Item {
kind: hir::ItemKind::Impl(hir::Impl { constness, .. }),
..
})) => constness,
Err(_) => hir::Constness::NotConst,
Ok(_) => match tcx.hir().body_const_context(local_did.unwrap()) {
Some(_) => hir::Constness::Const,
None => hir::Constness::NotConst,
},
},
Some(hir_id) => tcx.hir().get(hir_id).constness_for_typeck(),
None => hir::Constness::NotConst,
};