bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Print unevaluted constants as _ or as their source representation

Browse source
This commit is contained in:
Oliver Scherer 2019-04-24 14:10:52 +02:00
parent ecee75d114
commit b816ec1eb4
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc/ty/print/pretty.rs
View file

@ -1545,10 +1545,19 @@ define_print_and_forward_display! {
} }
if let ConstValue::Unevaluated(did, substs) = self.val { if let ConstValue::Unevaluated(did, substs) = self.val {
match cx.tcx().describe_def(did) { match cx.tcx().describe_def(did) {
| Some(Def::Static(_, _)) | Some(Def::Static(_))
| Some(Def::Const(_, false)) | Some(Def::Const(_))
| Some(Def::AssociatedConst(_)) => p!(write("{}", cx.tcx().def_path_str(did))), | Some(Def::AssociatedConst(_)) => p!(print_value_path(did, substs)),
_ => p!(write("_")), _ => if did.is_local() {
let span = cx.tcx().def_span(did);
if let Ok(snip) = cx.tcx().sess.source_map().span_to_snippet(span) {
p!(write("{}", snip))
} else {
p!(write("_"))
}
} else {
p!(write("_"))
},
} }
return Ok(cx); return Ok(cx);
} }