Pretty print records using field names #927
Conversation
| define_scoped!(cx, f); | ||
| w!("{}: {:?}", ^self.name, &self.value) | ||
| } | ||
| } |
| @@ -277,8 +278,25 @@ impl Pretty for Ty { | |||
| } | |||
| TyKind::Param(param_ty) => w!("{}", ^param_ty), | |||
| TyKind::Downcast(adt, .., variant_idx, fields) => { | |||
| w!("{:?}::{}", adt.did(), ^adt.variant(*variant_idx).name)?; | |||
| if !fields.is_empty() { | |||
| let is_struct = adt.is_struct(); | |||
There was a problem hiding this comment.
To ponder: maybe TyKind::Downcast is something we should hide from users so instead of printing
_1: S { x: i32[a0], y: i32[b1] }
we should print
_1.x: i32[a0], _1.y: i32[a1]
But perhaps the context that it is an S may be relevant to users too
But also { x: i32[a0], y: i32[a1] } doesn't have an equivalence in Rust syntax.
There was a problem hiding this comment.
Yes, a bit unclear what the right thing here is...
crates/flux-middle/src/rty/expr.rs
Outdated
| let field_binds = adt_sort_def | ||
| .field_names() | ||
| .iter() | ||
| .zip(flds) | ||
| .map(|(name, value)| FieldBind { name: *name, value: value.clone() }) | ||
| .collect_vec(); | ||
| w!("{{ {:?} }}", join!(", ", field_binds)) |
There was a problem hiding this comment.
wait @ranjitjhala!. Didn't notice this, I'm not sure we should skip the def_id blindly. So, if you write
S { v: v == S { x: 0, y: 0 } }I think we do want to keep the S inside
There was a problem hiding this comment.
With this change we print S {v: v == {x: 0, y: 0}}
There was a problem hiding this comment.
Good catch, no worries, will fix.
There was a problem hiding this comment.
I'll elide the S (DefId) only when printing ... a top-level index?
There was a problem hiding this comment.
I used a newtype wrapper type trick to only elide the DefId for top-level indices,
did you want to take a look? Or merge?
Instead of just commas or
foo.0.1.2...