about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorScott Olson <scott@solson.me>2016-01-01 21:01:17 -0600
committerScott Olson <scott@solson.me>2016-01-04 16:11:33 -0600
commit19a50e4f2a899ad2b4a7b05709dcfd8450a7bbdc (patch)
treee7f633223c7a9e8bb9f3f591bd6ee605c012df4c /src
parent6a33221ea54ad4a496c06f5d93fb1e32c8076454 (diff)
downloadrust-19a50e4f2a899ad2b4a7b05709dcfd8450a7bbdc.tar.gz
rust-19a50e4f2a899ad2b4a7b05709dcfd8450a7bbdc.zip
Pretty-print static lvalues in MIR as just their path.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/mir/repr.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc/mir/repr.rs b/src/librustc/mir/repr.rs
index 9a5f675ad4b..74cd698dd5a 100644
--- a/src/librustc/mir/repr.rs
+++ b/src/librustc/mir/repr.rs
@@ -551,24 +551,24 @@ impl<'tcx> Debug for Lvalue<'tcx> {
                 write!(fmt,"arg{:?}", id),
             Temp(id) =>
                 write!(fmt,"tmp{:?}", id),
-            Static(id) =>
-                write!(fmt,"Static({:?})", id),
+            Static(def_id) =>
+                write!(fmt, "{}", ty::tls::with(|tcx| tcx.item_path_str(def_id))),
             ReturnPointer =>
-                write!(fmt,"ReturnPointer"),
+                write!(fmt, "ReturnPointer"),
             Projection(ref data) =>
                 match data.elem {
                     ProjectionElem::Downcast(ref adt_def, index) =>
-                        write!(fmt,"({:?} as {})", data.base, adt_def.variants[index].name),
+                        write!(fmt, "({:?} as {})", data.base, adt_def.variants[index].name),
                     ProjectionElem::Deref =>
-                        write!(fmt,"(*{:?})", data.base),
+                        write!(fmt, "(*{:?})", data.base),
                     ProjectionElem::Field(field) =>
-                        write!(fmt,"{:?}.{:?}", data.base, field.index()),
+                        write!(fmt, "{:?}.{:?}", data.base, field.index()),
                     ProjectionElem::Index(ref index) =>
-                        write!(fmt,"{:?}[{:?}]", data.base, index),
+                        write!(fmt, "{:?}[{:?}]", data.base, index),
                     ProjectionElem::ConstantIndex { offset, min_length, from_end: false } =>
-                        write!(fmt,"{:?}[{:?} of {:?}]", data.base, offset, min_length),
+                        write!(fmt, "{:?}[{:?} of {:?}]", data.base, offset, min_length),
                     ProjectionElem::ConstantIndex { offset, min_length, from_end: true } =>
-                        write!(fmt,"{:?}[-{:?} of {:?}]", data.base, offset, min_length),
+                        write!(fmt, "{:?}[-{:?} of {:?}]", data.base, offset, min_length),
                 },
         }
     }