From fe34c90458184c5699e4070e88d74a04ea28da2b Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 26 Jul 2018 15:12:04 +0300 Subject: [PATCH] patch up mir-opt tests --- src/test/mir-opt/nll/named-lifetimes-basic.rs | 18 +++++++++--------- src/test/mir-opt/nll/reborrow-basic.rs | 4 ++-- src/test/mir-opt/nll/region-subtyping-basic.rs | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/mir-opt/nll/named-lifetimes-basic.rs b/src/test/mir-opt/nll/named-lifetimes-basic.rs index 5cca3e55259..adc0249a40c 100644 --- a/src/test/mir-opt/nll/named-lifetimes-basic.rs +++ b/src/test/mir-opt/nll/named-lifetimes-basic.rs @@ -34,15 +34,15 @@ fn main() { // | '_#4r | Local | ['_#4r] // | // | Inferred Region Values -// | '_#0r | {'_#0r, bb0[0..=1]} -// | '_#1r | {'_#1r, bb0[0..=1]} -// | '_#2r | {'_#2r, bb0[0..=1]} -// | '_#3r | {'_#3r, bb0[0..=1]} -// | '_#4r | {'_#4r, bb0[0..=1]} -// | '_#5r | {'_#1r, bb0[0..=1]} -// | '_#6r | {'_#2r, bb0[0..=1]} -// | '_#7r | {'_#1r, bb0[0..=1]} -// | '_#8r | {'_#3r, bb0[0..=1]} +// | '_#0r | U0 | {bb0[0..=127], '_#0r} +// | '_#1r | U0 | {bb0[0..=127], '_#1r} +// | '_#2r | U0 | {bb0[0..=127], '_#2r} +// | '_#3r | U0 | {bb0[0..=127], '_#3r} +// | '_#4r | U0 | {bb0[0..=127], '_#4r} +// | '_#5r | U0 | {bb0[0..=127], '_#1r} +// | '_#6r | U0 | {bb0[0..=127], '_#2r} +// | '_#7r | U0 | {bb0[0..=127], '_#1r} +// | '_#8r | U0 | {bb0[0..=127], '_#3r} // | // ... // fn use_x(_1: &'_#5r mut i32, _2: &'_#6r u32, _3: &'_#7r u32, _4: &'_#8r u32) -> bool { diff --git a/src/test/mir-opt/nll/reborrow-basic.rs b/src/test/mir-opt/nll/reborrow-basic.rs index 94a6a9799cf..8a7ea8962fc 100644 --- a/src/test/mir-opt/nll/reborrow-basic.rs +++ b/src/test/mir-opt/nll/reborrow-basic.rs @@ -28,9 +28,9 @@ fn main() { // END RUST SOURCE // START rustc.main.nll.0.mir -// | '_#7r | {bb0[4], bb0[8..=17]} +// | '_#7r | U0 | {bb0[4], bb0[8..=17]} // ... -// | '_#9r | {bb0[10], bb0[14..=17]} +// | '_#9r | U0 | {bb0[10], bb0[14..=17]} // ... // let _4: &'_#9r mut i32; // ... diff --git a/src/test/mir-opt/nll/region-subtyping-basic.rs b/src/test/mir-opt/nll/region-subtyping-basic.rs index a8dd6c73ef0..e554024efef 100644 --- a/src/test/mir-opt/nll/region-subtyping-basic.rs +++ b/src/test/mir-opt/nll/region-subtyping-basic.rs @@ -32,9 +32,9 @@ fn main() { // END RUST SOURCE // START rustc.main.nll.0.mir -// | '_#2r | {bb2[0..=3], bb3[0..=1]} -// | '_#3r | {bb2[1..=3], bb3[0..=1]} -// | '_#4r | {bb2[3], bb3[0..=1]} +// | '_#2r | U0 | {bb2[0..=3], bb3[0..=1]} +// | '_#3r | U0 | {bb2[1..=3], bb3[0..=1]} +// | '_#4r | U0 | {bb2[3], bb3[0..=1]} // END rustc.main.nll.0.mir // START rustc.main.nll.0.mir // let _6: &'_#4r usize;