nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 20:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #115873 - BoxyUwU:tykind_adt_debug, r=oli-obk

Browse Source 
Make `TyKind::Adt`'s `Debug` impl be more pretty

Currently `{:?}` on `Ty` for a `TyKind::Adt` would print as `Adt(Foo, [])`. This PR changes it to be `Foo` when there are no generics or `Foo<T>`/`Foo<T, U>` when there _are_ generics. Example from debug log:
`├─0ms DEBUG rustc_hir_analysis::astconv return=Bar<T/#0, U/#1>`

I should have done this in my initial PR for a prettier TyKind: Debug impl but I thought I would need to be accessing generics_of to figure out where in the "path" the generics would have to go??? but no, adts literally only have a single place the generics can go (on the end). Feel a bit silly about this :)

r? `@oli-obk`
This commit is contained in:
Matthias Krüger 2023-09-19 01:29:41 +02:00 committed by GitHub
commit 48c605129b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 51 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_middle/src/ty/context.rs
View File

@ -82,6 +82,7 @@ use std::ops::{Bound, Deref};
impl<'tcx> Interner for TyCtxt<'tcx> { impl<'tcx> Interner for TyCtxt<'tcx> {
type AdtDef = ty::AdtDef<'tcx>; type AdtDef = ty::AdtDef<'tcx>;
type GenericArgsRef = ty::GenericArgsRef<'tcx>; type GenericArgsRef = ty::GenericArgsRef<'tcx>;
type GenericArg = ty::GenericArg<'tcx>;
type DefId = DefId; type DefId = DefId;
type Binder<T> = Binder<'tcx, T>; type Binder<T> = Binder<'tcx, T>;
type Ty = Ty<'tcx>; type Ty = Ty<'tcx>;

7
compiler/rustc_type_ir/src/lib.rs
View File

@ -41,7 +41,12 @@ pub trait HashStableContext {}
pub trait Interner: Sized { pub trait Interner: Sized {
type AdtDef: Clone + Debug + Hash + Ord; type AdtDef: Clone + Debug + Hash + Ord;
type GenericArgsRef: Clone + DebugWithInfcx<Self> + Hash + Ord; type GenericArgsRef: Clone
+ DebugWithInfcx<Self>
+ Hash
+ Ord
+ IntoIterator<Item = Self::GenericArg>;
type GenericArg: Clone + DebugWithInfcx<Self> + Hash + Ord;
type DefId: Clone + Debug + Hash + Ord; type DefId: Clone + Debug + Hash + Ord;
type Binder<T>; type Binder<T>;
type Ty: Clone + DebugWithInfcx<Self> + Hash + Ord; type Ty: Clone + DebugWithInfcx<Self> + Hash + Ord;

16
compiler/rustc_type_ir/src/sty.rs
View File

@ -517,7 +517,21 @@ impl<I: Interner> DebugWithInfcx<I> for TyKind<I> {
Int(i) => write!(f, "{i:?}"), Int(i) => write!(f, "{i:?}"),
Uint(u) => write!(f, "{u:?}"), Uint(u) => write!(f, "{u:?}"),
Float(float) => write!(f, "{float:?}"), Float(float) => write!(f, "{float:?}"),
Adt(d, s) => f.debug_tuple_field2_finish("Adt", d, &this.wrap(s)), Adt(d, s) => {
write!(f, "{d:?}")?;
let mut s = s.clone().into_iter();
let first = s.next();
match first {
Some(first) => write!(f, "<{:?}", first)?,
None => return Ok(()),
};
for arg in s {
write!(f, ", {:?}", arg)?;
}
write!(f, ">")
}
Foreign(d) => f.debug_tuple_field1_finish("Foreign", d), Foreign(d) => f.debug_tuple_field1_finish("Foreign", d),
Str => write!(f, "str"), Str => write!(f, "str"),
Array(t, c) => write!(f, "[{:?}; {:?}]", &this.wrap(t), &this.wrap(c)), Array(t, c) => write!(f, "[{:?}; {:?}]", &this.wrap(t), &this.wrap(c)),

6
tests/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.panic-abort.mir
View File

@ -2,11 +2,7 @@
/* generator_layout = GeneratorLayout { /* generator_layout = GeneratorLayout {
field_tys: { field_tys: {
_0: GeneratorSavedTy { _0: GeneratorSavedTy {
ty: Adt( ty: std::string::String,
std::string::String,
[
],
),
source_info: SourceInfo { source_info: SourceInfo {
span: $DIR/generator_drop_cleanup.rs:11:13: 11:15 (#0), span: $DIR/generator_drop_cleanup.rs:11:13: 11:15 (#0),
scope: scope[0], scope: scope[0],

6
tests/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.panic-unwind.mir
View File

@ -2,11 +2,7 @@
/* generator_layout = GeneratorLayout { /* generator_layout = GeneratorLayout {
field_tys: { field_tys: {
_0: GeneratorSavedTy { _0: GeneratorSavedTy {
ty: Adt( ty: std::string::String,
std::string::String,
[
],
),
source_info: SourceInfo { source_info: SourceInfo {
span: $DIR/generator_drop_cleanup.rs:11:13: 11:15 (#0), span: $DIR/generator_drop_cleanup.rs:11:13: 11:15 (#0),
scope: scope[0], scope: scope[0],

6
tests/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir
View File

@ -2,11 +2,7 @@
/* generator_layout = GeneratorLayout { /* generator_layout = GeneratorLayout {
field_tys: { field_tys: {
_0: GeneratorSavedTy { _0: GeneratorSavedTy {
ty: Adt( ty: HasDrop,
HasDrop,
[
],
),
source_info: SourceInfo { source_info: SourceInfo {
span: $DIR/generator_tiny.rs:20:13: 20:15 (#0), span: $DIR/generator_tiny.rs:20:13: 20:15 (#0),
scope: scope[0], scope: scope[0],

96
tests/ui/thir-print/thir-flat-const-variant.stdout
View File

@ -1,11 +1,7 @@
DefId(0:8 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR1): DefId(0:8 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR1):
Thir { Thir {
body_type: Const( body_type: Const(
Adt( Foo,
Foo,
[
],
),
), ),
arms: [], arms: [],
blocks: [], blocks: [],
@ -50,11 +46,7 @@ Thir {
base: None, base: None,
}, },
), ),
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -68,11 +60,7 @@ Thir {
), ),
value: e2, value: e2,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -84,11 +72,7 @@ Thir {
lint_level: Inherited, lint_level: Inherited,
value: e3, value: e3,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -102,11 +86,7 @@ Thir {
DefId(0:9 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR2): DefId(0:9 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR2):
Thir { Thir {
body_type: Const( body_type: Const(
Adt( Foo,
Foo,
[
],
),
), ),
arms: [], arms: [],
blocks: [], blocks: [],
@ -151,11 +131,7 @@ Thir {
base: None, base: None,
}, },
), ),
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -169,11 +145,7 @@ Thir {
), ),
value: e2, value: e2,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -185,11 +157,7 @@ Thir {
lint_level: Inherited, lint_level: Inherited,
value: e3, value: e3,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -203,11 +171,7 @@ Thir {
DefId(0:10 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR3): DefId(0:10 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR3):
Thir { Thir {
body_type: Const( body_type: Const(
Adt( Foo,
Foo,
[
],
),
), ),
arms: [], arms: [],
blocks: [], blocks: [],
@ -252,11 +216,7 @@ Thir {
base: None, base: None,
}, },
), ),
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -270,11 +230,7 @@ Thir {
), ),
value: e2, value: e2,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -286,11 +242,7 @@ Thir {
lint_level: Inherited, lint_level: Inherited,
value: e3, value: e3,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -304,11 +256,7 @@ Thir {
DefId(0:11 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR4): DefId(0:11 ~ thir_flat_const_variant[1f54]::{impl#0}::BAR4):
Thir { Thir {
body_type: Const( body_type: Const(
Adt( Foo,
Foo,
[
],
),
), ),
arms: [], arms: [],
blocks: [], blocks: [],
@ -353,11 +301,7 @@ Thir {
base: None, base: None,
}, },
), ),
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -371,11 +315,7 @@ Thir {
), ),
value: e2, value: e2,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),
@ -387,11 +327,7 @@ Thir {
lint_level: Inherited, lint_level: Inherited,
value: e3, value: e3,
}, },
ty: Adt( ty: Foo,
Foo,
[
],
),
temp_lifetime: Some( temp_lifetime: Some(
Node(3), Node(3),
), ),

20
tests/ui/thir-print/thir-tree-match.stdout
View File

@ -1,13 +1,13 @@
DefId(0:16 ~ thir_tree_match[fcf8]::has_match): DefId(0:16 ~ thir_tree_match[fcf8]::has_match):
params: [ params: [
Param { Param {
ty: Adt(Foo, []) ty: Foo
ty_span: Some($DIR/thir-tree-match.rs:15:19: 15:22 (#0)) ty_span: Some($DIR/thir-tree-match.rs:15:19: 15:22 (#0))
self_kind: None self_kind: None
hir_id: Some(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).1)) hir_id: Some(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).1))
param: Some( param: Some(
Pat: { Pat: {
ty: Adt(Foo, []) ty: Foo
span: $DIR/thir-tree-match.rs:15:14: 15:17 (#0) span: $DIR/thir-tree-match.rs:15:14: 15:17 (#0)
kind: PatKind { kind: PatKind {
Binding { Binding {
@ -15,7 +15,7 @@ params: [
name: "foo" name: "foo"
mode: ByValue mode: ByValue
var: LocalVarId(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).2)) var: LocalVarId(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).2))
ty: Adt(Foo, []) ty: Foo
is_primary: true is_primary: true
subpattern: None subpattern: None
} }
@ -73,7 +73,7 @@ body:
Match { Match {
scrutinee: scrutinee:
Expr { Expr {
ty: Adt(Foo, []) ty: Foo
temp_lifetime: Some(Node(26)) temp_lifetime: Some(Node(26))
span: $DIR/thir-tree-match.rs:16:11: 16:14 (#0) span: $DIR/thir-tree-match.rs:16:11: 16:14 (#0)
kind: kind:
@ -82,7 +82,7 @@ body:
lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).4)) lint_level: Explicit(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).4))
value: value:
Expr { Expr {
ty: Adt(Foo, []) ty: Foo
temp_lifetime: Some(Node(26)) temp_lifetime: Some(Node(26))
span: $DIR/thir-tree-match.rs:16:11: 16:14 (#0) span: $DIR/thir-tree-match.rs:16:11: 16:14 (#0)
kind: kind:
@ -96,7 +96,7 @@ body:
Arm { Arm {
pattern: pattern:
Pat: { Pat: {
ty: Adt(Foo, []) ty: Foo
span: $DIR/thir-tree-match.rs:17:9: 17:32 (#0) span: $DIR/thir-tree-match.rs:17:9: 17:32 (#0)
kind: PatKind { kind: PatKind {
Variant { Variant {
@ -110,7 +110,7 @@ body:
variant_index: 0 variant_index: 0
subpatterns: [ subpatterns: [
Pat: { Pat: {
ty: Adt(Bar, []) ty: Bar
span: $DIR/thir-tree-match.rs:17:21: 17:31 (#0) span: $DIR/thir-tree-match.rs:17:21: 17:31 (#0)
kind: PatKind { kind: PatKind {
Variant { Variant {
@ -169,7 +169,7 @@ body:
Arm { Arm {
pattern: pattern:
Pat: { Pat: {
ty: Adt(Foo, []) ty: Foo
span: $DIR/thir-tree-match.rs:18:9: 18:23 (#0) span: $DIR/thir-tree-match.rs:18:9: 18:23 (#0)
kind: PatKind { kind: PatKind {
Variant { Variant {
@ -183,7 +183,7 @@ body:
variant_index: 0 variant_index: 0
subpatterns: [ subpatterns: [
Pat: { Pat: {
ty: Adt(Bar, []) ty: Bar
span: $DIR/thir-tree-match.rs:18:21: 18:22 (#0) span: $DIR/thir-tree-match.rs:18:21: 18:22 (#0)
kind: PatKind { kind: PatKind {
Wild Wild
@ -232,7 +232,7 @@ body:
Arm { Arm {
pattern: pattern:
Pat: { Pat: {
ty: Adt(Foo, []) ty: Foo
span: $DIR/thir-tree-match.rs:19:9: 19:20 (#0) span: $DIR/thir-tree-match.rs:19:9: 19:20 (#0)
kind: PatKind { kind: PatKind {
Variant { Variant {