bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Make type_of work correctly for const arg bindings

Browse source
This commit is contained in:
Michael Goulet 2022-09-26 23:44:43 +00:00
parent cca48285b8
commit 05267b5a50
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_hir_analysis/src/collect/type_of.rs
View file

@ -430,9 +430,15 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
tcx.adt_def(tcx.hir().get_parent_item(hir_id)).repr().discr_type().to_ty(tcx) tcx.adt_def(tcx.hir().get_parent_item(hir_id)).repr().discr_type().to_ty(tcx)
} }
Node::TypeBinding(binding @ &TypeBinding { hir_id: binding_id, .. }) Node::TypeBinding(
if let Node::TraitRef(trait_ref) = binding @ &TypeBinding {
tcx.hir().get(tcx.hir().get_parent_node(binding_id)) => hir_id: binding_id,
kind: TypeBindingKind::Equality { term: Term::Const(ref e) },
..
},
) if let Node::TraitRef(trait_ref) =
tcx.hir().get(tcx.hir().get_parent_node(binding_id))
&& e.hir_id == hir_id =>
{ {
let Some(trait_def_id) = trait_ref.trait_def_id() else { let Some(trait_def_id) = trait_ref.trait_def_id() else {
return tcx.ty_error_with_message(DUMMY_SP, "Could not find trait"); return tcx.ty_error_with_message(DUMMY_SP, "Could not find trait");