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

Format type_of

Browse source
This commit is contained in:
Michael Goulet 2022-09-26 23:39:27 +00:00
parent 57ee5cf5a9
commit cca48285b8
1 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -333,7 +333,12 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
find_opaque_ty_constraints_for_tait(tcx, def_id) find_opaque_ty_constraints_for_tait(tcx, def_id)
} }
// Opaque types desugared from `impl Trait`. // Opaque types desugared from `impl Trait`.
ItemKind::OpaqueTy(OpaqueTy { origin: hir::OpaqueTyOrigin::FnReturn(owner) | hir::OpaqueTyOrigin::AsyncFn(owner), in_trait, .. }) => { ItemKind::OpaqueTy(OpaqueTy {
origin:
hir::OpaqueTyOrigin::FnReturn(owner) | hir::OpaqueTyOrigin::AsyncFn(owner),
in_trait,
..
}) => {
if in_trait { if in_trait {
span_bug!(item.span, "impl-trait in trait has no default") span_bug!(item.span, "impl-trait in trait has no default")
} else { } else {
@ -378,7 +383,9 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
Node::Field(field) => icx.to_ty(field.ty), Node::Field(field) => icx.to_ty(field.ty),
Node::Expr(&Expr { kind: ExprKind::Closure{..}, .. }) => tcx.typeck(def_id).node_type(hir_id), Node::Expr(&Expr { kind: ExprKind::Closure { .. }, .. }) => {
tcx.typeck(def_id).node_type(hir_id)
}
Node::AnonConst(_) if let Some(param) = tcx.opt_const_param_of(def_id) => { Node::AnonConst(_) if let Some(param) = tcx.opt_const_param_of(def_id) => {
// We defer to `type_of` of the corresponding parameter // We defer to `type_of` of the corresponding parameter
@ -410,40 +417,42 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
| Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. }) | Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. })
if asm.operands.iter().any(|(op, _op_sp)| match op { if asm.operands.iter().any(|(op, _op_sp)| match op {
hir::InlineAsmOperand::Const { anon_const } hir::InlineAsmOperand::Const { anon_const }
| hir::InlineAsmOperand::SymFn { anon_const } => anon_const.hir_id == hir_id, | hir::InlineAsmOperand::SymFn { anon_const } => {
anon_const.hir_id == hir_id
}
_ => false, _ => false,
}) => }) =>
{ {
tcx.typeck(def_id).node_type(hir_id) tcx.typeck(def_id).node_type(hir_id)
} }
Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => tcx Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => {
.adt_def(tcx.hir().get_parent_item(hir_id)) tcx.adt_def(tcx.hir().get_parent_item(hir_id)).repr().discr_type().to_ty(tcx)
.repr() }
.discr_type()
.to_ty(tcx),
Node::TypeBinding(binding @ &TypeBinding { hir_id: binding_id, .. }) Node::TypeBinding(binding @ &TypeBinding { hir_id: binding_id, .. })
if let Node::TraitRef(trait_ref) = tcx.hir().get( if let Node::TraitRef(trait_ref) =
tcx.hir().get_parent_node(binding_id) tcx.hir().get(tcx.hir().get_parent_node(binding_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");
}; };
let assoc_items = tcx.associated_items(trait_def_id); let assoc_items = tcx.associated_items(trait_def_id);
let assoc_item = assoc_items.find_by_name_and_kind( let assoc_item = assoc_items.find_by_name_and_kind(
tcx, binding.ident, ty::AssocKind::Const, def_id.to_def_id(), tcx,
); binding.ident,
if let Some(assoc_item) = assoc_item { ty::AssocKind::Const,
tcx.type_of(assoc_item.def_id) def_id.to_def_id(),
} else { );
// FIXME(associated_const_equality): add a useful error message here. if let Some(assoc_item) = assoc_item {
tcx.ty_error_with_message( tcx.type_of(assoc_item.def_id)
DUMMY_SP, } else {
"Could not find associated const on trait", // FIXME(associated_const_equality): add a useful error message here.
) tcx.ty_error_with_message(
} DUMMY_SP,
"Could not find associated const on trait",
)
}
} }
Node::GenericParam(&GenericParam { Node::GenericParam(&GenericParam {
@ -452,8 +461,7 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
.. ..
}) if ct.hir_id == hir_id => tcx.type_of(tcx.hir().local_def_id(param_hir_id)), }) if ct.hir_id == hir_id => tcx.type_of(tcx.hir().local_def_id(param_hir_id)),
x => x => tcx.ty_error_with_message(
tcx.ty_error_with_message(
DUMMY_SP, DUMMY_SP,
&format!("unexpected const parent in type_of(): {x:?}"), &format!("unexpected const parent in type_of(): {x:?}"),
), ),