From 92f2d27d1b5ec6b81299edf0e55bb1f0fc45ae9b Mon Sep 17 00:00:00 2001 From: b-naber Date: Fri, 27 Jan 2023 22:13:55 +0100 Subject: [PATCH] address review --- compiler/rustc_middle/src/thir/print.rs | 14 ++--- compiler/rustc_middle/src/ty/adt.rs | 6 +- tests/ui/thir-print/thir-flat.rs | 4 ++ tests/ui/thir-print/thir-flat.stdout | 56 +++++++++++++++++++ tests/ui/{ => thir-print}/thir-tree-match.rs | 0 .../{ => thir-print}/thir-tree-match.stdout | 0 tests/ui/{ => thir-print}/thir-tree.rs | 0 tests/ui/{ => thir-print}/thir-tree.stdout | 0 8 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 tests/ui/thir-print/thir-flat.rs create mode 100644 tests/ui/thir-print/thir-flat.stdout rename tests/ui/{ => thir-print}/thir-tree-match.rs (100%) rename tests/ui/{ => thir-print}/thir-tree-match.stdout (100%) rename tests/ui/{ => thir-print}/thir-tree.rs (100%) rename tests/ui/{ => thir-print}/thir-tree.stdout (100%) diff --git a/compiler/rustc_middle/src/thir/print.rs b/compiler/rustc_middle/src/thir/print.rs index 28ef768ade6..60b903e9906 100644 --- a/compiler/rustc_middle/src/thir/print.rs +++ b/compiler/rustc_middle/src/thir/print.rs @@ -522,7 +522,7 @@ fn print_expr_kind(&mut self, expr_kind: &ExprKind<'tcx>, depth_lvl: usize) { fn print_adt_expr(&mut self, adt_expr: &AdtExpr<'tcx>, depth_lvl: usize) { print_indented!(self, "adt_def:", depth_lvl); - self.print_adt_def(&*adt_expr.adt_def.0, depth_lvl + 1); + self.print_adt_def(adt_expr.adt_def, depth_lvl + 1); print_indented!( self, format!("variant_index: {:?}", adt_expr.variant_index), @@ -544,12 +544,12 @@ fn print_adt_expr(&mut self, adt_expr: &AdtExpr<'tcx>, depth_lvl: usize) { } } - fn print_adt_def(&mut self, adt_def: &ty::AdtDefData, depth_lvl: usize) { + fn print_adt_def(&mut self, adt_def: ty::AdtDef<'tcx>, depth_lvl: usize) { print_indented!(self, "AdtDef {", depth_lvl); - print_indented!(self, format!("did: {:?}", adt_def.did), depth_lvl + 1); - print_indented!(self, format!("variants: {:?}", adt_def.variants), depth_lvl + 1); - print_indented!(self, format!("flags: {:?}", adt_def.flags), depth_lvl + 1); - print_indented!(self, format!("repr: {:?}", adt_def.repr), depth_lvl + 1); + print_indented!(self, format!("did: {:?}", adt_def.did()), depth_lvl + 1); + print_indented!(self, format!("variants: {:?}", adt_def.variants()), depth_lvl + 1); + print_indented!(self, format!("flags: {:?}", adt_def.flags()), depth_lvl + 1); + print_indented!(self, format!("repr: {:?}", adt_def.repr()), depth_lvl + 1); } fn print_fru_info(&mut self, fru_info: &FruInfo<'tcx>, depth_lvl: usize) { @@ -633,7 +633,7 @@ fn print_pat_kind(&mut self, pat_kind: &PatKind<'tcx>, depth_lvl: usize) { PatKind::Variant { adt_def, substs, variant_index, subpatterns } => { print_indented!(self, "Variant {", depth_lvl + 1); print_indented!(self, "adt_def: ", depth_lvl + 2); - self.print_adt_def(&*adt_def.0, depth_lvl + 3); + self.print_adt_def(*adt_def, depth_lvl + 3); print_indented!(self, format!("substs: {:?}", substs), depth_lvl + 2); print_indented!(self, format!("variant_index: {:?}", variant_index), depth_lvl + 2); diff --git a/compiler/rustc_middle/src/ty/adt.rs b/compiler/rustc_middle/src/ty/adt.rs index 3d6da7fe792..d3d667f6840 100644 --- a/compiler/rustc_middle/src/ty/adt.rs +++ b/compiler/rustc_middle/src/ty/adt.rs @@ -90,11 +90,11 @@ pub struct AdtDefData { /// The `DefId` of the struct, enum or union item. pub did: DefId, /// Variants of the ADT. If this is a struct or union, then there will be a single variant. - pub(crate) variants: IndexVec, + variants: IndexVec, /// Flags of the ADT (e.g., is this a struct? is this non-exhaustive?). - pub(crate) flags: AdtFlags, + flags: AdtFlags, /// Repr options provided by the user. - pub(crate) repr: ReprOptions, + repr: ReprOptions, } impl PartialOrd for AdtDefData { diff --git a/tests/ui/thir-print/thir-flat.rs b/tests/ui/thir-print/thir-flat.rs new file mode 100644 index 00000000000..8fa95ce62b5 --- /dev/null +++ b/tests/ui/thir-print/thir-flat.rs @@ -0,0 +1,4 @@ +// compile-flags: -Z unpretty=thir-flat +// check-pass + +pub fn main() {} diff --git a/tests/ui/thir-print/thir-flat.stdout b/tests/ui/thir-print/thir-flat.stdout new file mode 100644 index 00000000000..c399fa66b6a --- /dev/null +++ b/tests/ui/thir-print/thir-flat.stdout @@ -0,0 +1,56 @@ +DefId(0:3 ~ thir_flat[45a6]::main): +Thir { + arms: [], + blocks: [ + Block { + targeted_by_break: false, + region_scope: Node(1), + opt_destruction_scope: None, + span: $DIR/thir-flat.rs:4:15: 4:17 (#0), + stmts: [], + expr: None, + safety_mode: Safe, + }, + ], + exprs: [ + Expr { + ty: (), + temp_lifetime: Some( + Node(2), + ), + span: $DIR/thir-flat.rs:4:15: 4:17 (#0), + kind: Block { + block: b0, + }, + }, + Expr { + ty: (), + temp_lifetime: Some( + Node(2), + ), + span: $DIR/thir-flat.rs:4:15: 4:17 (#0), + kind: Scope { + region_scope: Node(2), + lint_level: Explicit( + HirId(DefId(0:3 ~ thir_flat[45a6]::main).2), + ), + value: e0, + }, + }, + Expr { + ty: (), + temp_lifetime: Some( + Node(2), + ), + span: $DIR/thir-flat.rs:4:15: 4:17 (#0), + kind: Scope { + region_scope: Destruction(2), + lint_level: Inherited, + value: e1, + }, + }, + ], + stmts: [], + params: [], +} + diff --git a/tests/ui/thir-tree-match.rs b/tests/ui/thir-print/thir-tree-match.rs similarity index 100% rename from tests/ui/thir-tree-match.rs rename to tests/ui/thir-print/thir-tree-match.rs diff --git a/tests/ui/thir-tree-match.stdout b/tests/ui/thir-print/thir-tree-match.stdout similarity index 100% rename from tests/ui/thir-tree-match.stdout rename to tests/ui/thir-print/thir-tree-match.stdout diff --git a/tests/ui/thir-tree.rs b/tests/ui/thir-print/thir-tree.rs similarity index 100% rename from tests/ui/thir-tree.rs rename to tests/ui/thir-print/thir-tree.rs diff --git a/tests/ui/thir-tree.stdout b/tests/ui/thir-print/thir-tree.stdout similarity index 100% rename from tests/ui/thir-tree.stdout rename to tests/ui/thir-print/thir-tree.stdout -- 2.44.0