From d2c8893137fa98ce3b0de68b1d6ee95aecb743ee Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 29 Sep 2016 01:22:11 +0200 Subject: [PATCH] Remove MIR dump comments from mir-opt tests They're ignored by the test runner, so let's not suggest that they matter --- src/test/mir-opt/deaggregator_test.rs | 20 ++++++------ src/test/mir-opt/deaggregator_test_enum.rs | 18 +++++----- src/test/mir-opt/simplify_if.rs | 6 ++-- src/test/mir-opt/storage_ranges.rs | 38 +++++++++++----------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/test/mir-opt/deaggregator_test.rs b/src/test/mir-opt/deaggregator_test.rs index 36738ba1f7d84..3304a66773ad2 100644 --- a/src/test/mir-opt/deaggregator_test.rs +++ b/src/test/mir-opt/deaggregator_test.rs @@ -23,19 +23,19 @@ fn main() {} // END RUST SOURCE // START rustc.node13.Deaggregator.before.mir // bb0: { -// _2 = _1; // scope 0 at main.rs:8:8: 8:9 -// _3 = _2; // scope 1 at main.rs:9:14: 9:15 -// _0 = Baz { x: _3, y: const F32(0), z: const false }; // scope ... -// goto -> bb1; // scope 1 at main.rs:8:1: 10:2 +// _2 = _1; +// _3 = _2; +// _0 = Baz { x: _3, y: const F32(0), z: const false }; +// goto -> bb1; // } // END rustc.node13.Deaggregator.before.mir // START rustc.node13.Deaggregator.after.mir // bb0: { -// _2 = _1; // scope 0 at main.rs:8:8: 8:9 -// _3 = _2; // scope 1 at main.rs:9:14: 9:15 -// (_0.0: usize) = _3; // scope 1 at main.rs:9:5: 9:34 -// (_0.1: f32) = const F32(0); // scope 1 at main.rs:9:5: 9:34 -// (_0.2: bool) = const false; // scope 1 at main.rs:9:5: 9:34 -// goto -> bb1; // scope 1 at main.rs:8:1: 10:2 +// _2 = _1; +// _3 = _2; +// (_0.0: usize) = _3; +// (_0.1: f32) = const F32(0); +// (_0.2: bool) = const false; +// goto -> bb1; // } // END rustc.node13.Deaggregator.after.mir diff --git a/src/test/mir-opt/deaggregator_test_enum.rs b/src/test/mir-opt/deaggregator_test_enum.rs index f5426e410cfe5..a6f12886f5527 100644 --- a/src/test/mir-opt/deaggregator_test_enum.rs +++ b/src/test/mir-opt/deaggregator_test_enum.rs @@ -28,18 +28,18 @@ fn main() { // END RUST SOURCE // START rustc.node10.Deaggregator.before.mir // bb0: { -// _2 = _1; // scope 0 at main.rs:7:8: 7:9 -// _3 = _2; // scope 1 at main.rs:8:19: 8:20 -// _0 = Baz::Foo { x: _3 }; // scope 1 at main.rs:8:5: 8:21 -// goto -> bb1; // scope 1 at main.rs:7:1: 9:2 +// _2 = _1; +// _3 = _2; +// _0 = Baz::Foo { x: _3 }; +// goto -> bb1; // } // END rustc.node10.Deaggregator.before.mir // START rustc.node10.Deaggregator.after.mir // bb0: { -// _2 = _1; // scope 0 at main.rs:7:8: 7:9 -// _3 = _2; // scope 1 at main.rs:8:19: 8:20 -// ((_0 as Foo).0: usize) = _3; // scope 1 at main.rs:8:5: 8:21 -// discriminant(_0) = 1; // scope 1 at main.rs:8:5: 8:21 -// goto -> bb1; // scope 1 at main.rs:7:1: 9:2 +// _2 = _1; +// _3 = _2; +// ((_0 as Foo).0: usize) = _3; +// discriminant(_0) = 1; +// goto -> bb1; // } // END rustc.node10.Deaggregator.after.mir diff --git a/src/test/mir-opt/simplify_if.rs b/src/test/mir-opt/simplify_if.rs index dd6a857960432..7239e32357b95 100644 --- a/src/test/mir-opt/simplify_if.rs +++ b/src/test/mir-opt/simplify_if.rs @@ -17,11 +17,11 @@ fn main() { // END RUST SOURCE // START rustc.node4.SimplifyBranches.initial-before.mir // bb0: { -// if(const false) -> [true: bb1, false: bb2]; // scope 0 at simplify_if.rs:12:5: 14:6 +// if(const false) -> [true: bb1, false: bb2]; // } // END rustc.node4.SimplifyBranches.initial-before.mir // START rustc.node4.SimplifyBranches.initial-after.mir // bb0: { -// goto -> bb2; // scope 0 at simplify_if.rs:12:5: 14:6 +// goto -> bb2; // } -// END rustc.node4.SimplifyBranches.initial-after.mir \ No newline at end of file +// END rustc.node4.SimplifyBranches.initial-after.mir diff --git a/src/test/mir-opt/storage_ranges.rs b/src/test/mir-opt/storage_ranges.rs index aa798231b34a3..3885b233fd296 100644 --- a/src/test/mir-opt/storage_ranges.rs +++ b/src/test/mir-opt/storage_ranges.rs @@ -21,27 +21,27 @@ fn main() { // END RUST SOURCE // START rustc.node4.TypeckMir.before.mir // bb0: { -// StorageLive(_1); // scope 0 at storage_ranges.rs:12:9: 12:10 -// _1 = const 0i32; // scope 0 at storage_ranges.rs:12:13: 12:14 -// StorageLive(_3); // scope 1 at storage_ranges.rs:14:13: 14:14 -// StorageLive(_4); // scope 1 at storage_ranges.rs:14:18: 14:25 -// StorageLive(_5); // scope 1 at storage_ranges.rs:14:23: 14:24 -// _5 = _1; // scope 1 at storage_ranges.rs:14:23: 14:24 -// _4 = std::option::Option::Some(_5,); // scope 1 at storage_ranges.rs:14:18: 14:25 -// _3 = &_4; // scope 1 at storage_ranges.rs:14:17: 14:25 -// StorageDead(_5); // scope 1 at storage_ranges.rs:14:23: 14:24 -// _2 = (); // scope 2 at storage_ranges.rs:13:5: 15:6 -// StorageDead(_4); // scope 1 at storage_ranges.rs:14:18: 14:25 -// StorageDead(_3); // scope 1 at storage_ranges.rs:14:13: 14:14 -// StorageLive(_6); // scope 1 at storage_ranges.rs:16:9: 16:10 -// _6 = const 1i32; // scope 1 at storage_ranges.rs:16:13: 16:14 -// _0 = (); // scope 3 at storage_ranges.rs:11:11: 17:2 -// StorageDead(_6); // scope 1 at storage_ranges.rs:16:9: 16:10 -// StorageDead(_1); // scope 0 at storage_ranges.rs:14:9: 14:10 -// goto -> bb1; // scope 0 at storage_ranges.rs:11:1: 17:2 +// StorageLive(_1); +// _1 = const 0i32; +// StorageLive(_3); +// StorageLive(_4); +// StorageLive(_5); +// _5 = _1; +// _4 = std::option::Option::Some(_5,); +// _3 = &_4; +// StorageDead(_5); +// _2 = (); +// StorageDead(_4); +// StorageDead(_3); +// StorageLive(_6); +// _6 = const 1i32; +// _0 = (); +// StorageDead(_6); +// StorageDead(_1); +// goto -> bb1; // } // // bb1: { -// return; // scope 0 at storage_ranges.rs:13:1: 19:2 +// return; // } // END rustc.node4.TypeckMir.before.mir