squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Use use_verbose for mir::Constant

Browse source
This commit is contained in:
Deadbeef 2021-06-23 10:39:23 +08:00
parent 4573a4a879
commit 4d1b3a584e
No known key found for this signature in database
GPG key ID: 6525773485376D92
1 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
compiler/rustc_mir/src/util/pretty.rs
View file

@ -426,14 +426,14 @@ impl ExtraComments<'tcx> {
} }
} }
fn use_verbose(ty: &&TyS<'tcx>) -> bool { fn use_verbose(ty: &&TyS<'tcx>, fn_def: bool) -> bool {
match ty.kind() { match ty.kind() {
ty::Int(_) | ty::Uint(_) | ty::Bool | ty::Char | ty::Float(_) => false, ty::Int(_) | ty::Uint(_) | ty::Bool | ty::Char | ty::Float(_) => false,
// Unit type // Unit type
ty::Tuple(g_args) if g_args.is_empty() => false, ty::Tuple(g_args) if g_args.is_empty() => false,
ty::Tuple(g_args) => g_args.iter().any(|g_arg| use_verbose(&g_arg.expect_ty())), ty::Tuple(g_args) => g_args.iter().any(|g_arg| use_verbose(&g_arg.expect_ty(), fn_def)),
ty::Array(ty, _) => use_verbose(ty), ty::Array(ty, _) => use_verbose(ty, fn_def),
ty::FnDef(..) => false, ty::FnDef(..) => fn_def,
_ => true, _ => true,
} }
} }
@ -442,28 +442,20 @@ impl Visitor<'tcx> for ExtraComments<'tcx> {
fn visit_constant(&mut self, constant: &Constant<'tcx>, location: Location) { fn visit_constant(&mut self, constant: &Constant<'tcx>, location: Location) {
self.super_constant(constant, location); self.super_constant(constant, location);
let Constant { span, user_ty, literal } = constant; let Constant { span, user_ty, literal } = constant;
match literal.ty().kind() { if use_verbose(&literal.ty(), true) {
ty::Int(_) | ty::Uint(_) | ty::Bool | ty::Char => {} self.push("mir::Constant");
// Unit type self.push(&format!(
ty::Tuple(tys) if tys.is_empty() => {} "+ span: {}",
_ => { self.tcx.sess.source_map().span_to_embeddable_string(*span)
self.push("mir::Constant"); ));
self.push(&format!( if let Some(user_ty) = user_ty {
"+ span: {}", self.push(&format!("+ user_ty: {:?}", user_ty));
self.tcx.sess.source_map().span_to_embeddable_string(*span) }
)); match literal {
if let Some(user_ty) = user_ty { ConstantKind::Ty(literal) => self.push(&format!("+ literal: {:?}", literal)),
self.push(&format!("+ user_ty: {:?}", user_ty)); ConstantKind::Val(val, ty) => {
} // To keep the diffs small, we render this almost like we render ty::Const
match literal { self.push(&format!("+ literal: Const {{ ty: {}, val: Value({:?}) }}", ty, val))
ConstantKind::Ty(literal) => self.push(&format!("+ literal: {:?}", literal)),
ConstantKind::Val(val, ty) => {
// To keep the diffs small, we render this almost like we render ty::Const
self.push(&format!(
"+ literal: Const {{ ty: {}, val: Value({:?}) }}",
ty, val
))
}
} }
} }
} }
@ -472,7 +464,7 @@ impl Visitor<'tcx> for ExtraComments<'tcx> {
fn visit_const(&mut self, constant: &&'tcx ty::Const<'tcx>, _: Location) { fn visit_const(&mut self, constant: &&'tcx ty::Const<'tcx>, _: Location) {
self.super_const(constant); self.super_const(constant);
let ty::Const { ty, val, .. } = constant; let ty::Const { ty, val, .. } = constant;
if use_verbose(ty) { if use_verbose(ty, false) {
self.push("ty::Const"); self.push("ty::Const");
self.push(&format!("+ ty: {:?}", ty)); self.push(&format!("+ ty: {:?}", ty));
let val = match val { let val = match val {