bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename thir::Adt as thir::AdtExpr.

Browse source 
This matches the naming scheme used elsewhere, e.g. in the AST, and
avoids name clashes with the `ExprKind::Closure` variant.
This commit is contained in:
Nicholas Nethercote 2022-08-24 12:59:06 +10:00
parent e57ac764b8
commit e3755c1d54
5 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_build/src/build/expr/into.rs
View file

@ -314,7 +314,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
this.cfg.push_assign(block, source_info, destination, address_of);
block.unit()
}
ExprKind::Adt(box Adt {
ExprKind::Adt(box AdtExpr {
adt_def,
variant_index,
substs,
@ -400,7 +400,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
);
block.unit()
}
ExprKind::InlineAsm(box InlineAsmExpr { template, ref operands, options, line_spans }) => {
ExprKind::InlineAsm(box InlineAsmExpr {
template,
ref operands,
options,
line_spans,
}) => {
use rustc_middle::{mir, thir};
let operands = operands
.into_iter()

2
compiler/rustc_mir_build/src/check_unsafety.rs
View file

@ -391,7 +391,7 @@ impl<'a, 'tcx> Visitor<'a, 'tcx> for UnsafetyVisitor<'a, 'tcx> {
ExprKind::InlineAsm { .. } => {
self.requires_unsafe(expr.span, UseOfInlineAssembly);
}
ExprKind::Adt(box Adt {
ExprKind::Adt(box AdtExpr {
adt_def,
variant_index: _,
substs: _,

8
compiler/rustc_mir_build/src/thir/cx/expr.rs
View file

@ -341,7 +341,7 @@ impl<'tcx> Cx<'tcx> {
expr: self.mirror_expr(e),
})
.collect();
ExprKind::Adt(Box::new(Adt {
ExprKind::Adt(Box::new(AdtExpr {
adt_def,
substs,
variant_index: index,
@ -466,7 +466,7 @@ impl<'tcx> Cx<'tcx> {
let user_provided_types = self.typeck_results().user_provided_types();
let user_ty = user_provided_types.get(expr.hir_id).copied().map(Box::new);
debug!("make_mirror_unadjusted: (struct/union) user_ty={:?}", user_ty);
ExprKind::Adt(Box::new(Adt {
ExprKind::Adt(Box::new(AdtExpr {
adt_def: *adt,
variant_index: VariantIdx::new(0),
substs,
@ -493,7 +493,7 @@ impl<'tcx> Cx<'tcx> {
let user_ty =
user_provided_types.get(expr.hir_id).copied().map(Box::new);
debug!("make_mirror_unadjusted: (variant) user_ty={:?}", user_ty);
ExprKind::Adt(Box::new(Adt {
ExprKind::Adt(Box::new(AdtExpr {
adt_def: *adt,
variant_index: index,
substs,
@ -867,7 +867,7 @@ impl<'tcx> Cx<'tcx> {
match ty.kind() {
// A unit struct/variant which is used as a value.
// We return a completely different ExprKind here to account for this special case.
ty::Adt(adt_def, substs) => ExprKind::Adt(Box::new(Adt {
ty::Adt(adt_def, substs) => ExprKind::Adt(Box::new(AdtExpr {
adt_def: *adt_def,
variant_index: adt_def.variant_index_with_ctor_id(def_id),
substs,