about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-01-09 14:04:20 -0500
committerSteve Klabnik <steve@steveklabnik.com>2016-01-09 14:04:20 -0500
commitc0983cd67e2584da4031e1e417bb4150a10c1460 (patch)
tree636ecba236cf29376472329093fc44f6d9163735
parent1345d188b7b71c6c0450b7bbb1945ab07e29dd37 (diff)
parent8e293676eef08b61cef57200927e7cbc5b901337 (diff)
downloadrust-c0983cd67e2584da4031e1e417bb4150a10c1460.tar.gz
rust-c0983cd67e2584da4031e1e417bb4150a10c1460.zip
Rollup merge of #30771 - tsion:mir-text-terminator-fix, r=eddyb
This just removes the `Some()` that appeared around terminators in MIR text output after https://github.com/rust-lang/rust/pull/30481 (cc @nagisa). The graphviz is already fixed.

r? @eddyb
-rw-r--r--src/librustc_mir/pretty.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/pretty.rs b/src/librustc_mir/pretty.rs
index 163559f2792..ea4036a4d37 100644
--- a/src/librustc_mir/pretty.rs
+++ b/src/librustc_mir/pretty.rs
@@ -39,7 +39,7 @@ fn write_basic_block<W: Write>(block: BasicBlock, mir: &Mir, w: &mut W) -> io::R
     }
 
     // Terminator at the bottom.
-    try!(writeln!(w, "{0}{0}{1:?};", INDENT, data.terminator));
+    try!(writeln!(w, "{0}{0}{1:?};", INDENT, data.terminator()));
 
     writeln!(w, "{}}}", INDENT)
 }