From 95b0f22240dcce4f827703a0e1de1b1bea3e902a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 24 Jul 2017 13:43:05 -0700
Subject: [PATCH 1/2] Fix printing regions with -Z verbose
---
src/librustc/mir/mod.rs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index d176ae761e1..f3d92d3692d 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -1208,14 +1208,11 @@ impl<'tcx> Debug for Rvalue<'tcx> {
BorrowKind::Mut | BorrowKind::Unique => "mut ",
};
- // When identifying regions, add trailing space if
- // necessary.
- let region = if ppaux::identify_regions() {
+ // When printing regions, add trailing space if necessary.
+ let region = {
let mut region = format!("{}", region);
if region.len() > 0 { region.push(' '); }
region
- } else {
- "".to_owned()
};
write!(fmt, "&{}{}{:?}", region, kind_str, lv)
}
From 4e1249d75f420392d7f1f45188d39d32cdab2662 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 24 Jul 2017 16:32:11 -0700
Subject: [PATCH 2/2] avoid printing 'static
---
src/librustc/mir/mod.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index f3d92d3692d..d78e17ce03c 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -1209,10 +1209,13 @@ impl<'tcx> Debug for Rvalue<'tcx> {
};
// When printing regions, add trailing space if necessary.
- let region = {
+ let region = if ppaux::verbose() || ppaux::identify_regions() {
let mut region = format!("{}", region);
if region.len() > 0 { region.push(' '); }
region
+ } else {
+ // Do not even print 'static
+ "".to_owned()
};
write!(fmt, "&{}{}{:?}", region, kind_str, lv)
}