From d455421edcb0c0084207d44b206ee1032913e580 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 30 May 2022 19:19:39 -0400 Subject: [PATCH 1/2] rustup --- rust-version | 2 +- tests/compile-fail/generator-pinned-moved.rs | 1 + tests/compile-fail/generator-pinned-moved.stderr | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rust-version b/rust-version index 8da4cbec7ff..09a847a94fb 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -0f06824013761ed6829887019033f1001e68f623 +c35035cefc709abddabfb28ecc6a326458d46ce2 diff --git a/tests/compile-fail/generator-pinned-moved.rs b/tests/compile-fail/generator-pinned-moved.rs index e0ce5cb7333..8c8e8284700 100644 --- a/tests/compile-fail/generator-pinned-moved.rs +++ b/tests/compile-fail/generator-pinned-moved.rs @@ -1,3 +1,4 @@ +// compile-flags: -Zmiri-disable-validation #![feature(generators, generator_trait)] use std::{ diff --git a/tests/compile-fail/generator-pinned-moved.stderr b/tests/compile-fail/generator-pinned-moved.stderr index 98ccf3097c2..0ac4f8caa07 100644 --- a/tests/compile-fail/generator-pinned-moved.stderr +++ b/tests/compile-fail/generator-pinned-moved.stderr @@ -8,12 +8,12 @@ LL | *num += 1; = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: inside closure at $DIR/generator-pinned-moved.rs:LL:CC -note: inside ` as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC +note: inside ` as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC --> $DIR/generator-pinned-moved.rs:LL:CC | LL | match me.resume(()) { | ^^^^^^^^^^^^^ - = note: inside `> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC + = note: inside `> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC note: inside `main` at $DIR/generator-pinned-moved.rs:LL:CC --> $DIR/generator-pinned-moved.rs:LL:CC | From 7fb5110160b0d931814fcc1176ac440cd19af4a8 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 30 May 2022 19:21:22 -0400 Subject: [PATCH 2/2] normalize away some more line numbers --- tests/compile-fail/generator-pinned-moved.stderr | 4 ++-- tests/compile-fail/panic/bad_unwind.stderr | 6 +++--- .../stacked_borrows/deallocate_against_barrier1.stderr | 2 +- .../stacked_borrows/deallocate_against_barrier2.stderr | 2 +- tests/compiletest.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/compile-fail/generator-pinned-moved.stderr b/tests/compile-fail/generator-pinned-moved.stderr index 0ac4f8caa07..56bfc6092b7 100644 --- a/tests/compile-fail/generator-pinned-moved.stderr +++ b/tests/compile-fail/generator-pinned-moved.stderr @@ -8,12 +8,12 @@ LL | *num += 1; = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: inside closure at $DIR/generator-pinned-moved.rs:LL:CC -note: inside ` as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC +note: inside ` as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC --> $DIR/generator-pinned-moved.rs:LL:CC | LL | match me.resume(()) { | ^^^^^^^^^^^^^ - = note: inside `> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC + = note: inside `> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC note: inside `main` at $DIR/generator-pinned-moved.rs:LL:CC --> $DIR/generator-pinned-moved.rs:LL:CC | diff --git a/tests/compile-fail/panic/bad_unwind.stderr b/tests/compile-fail/panic/bad_unwind.stderr index 529f4179a8f..5030391bc6e 100644 --- a/tests/compile-fail/panic/bad_unwind.stderr +++ b/tests/compile-fail/panic/bad_unwind.stderr @@ -10,9 +10,9 @@ LL | std::panic::catch_unwind(|| unwind()).unwrap_err(); = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information = note: inside closure at $DIR/bad_unwind.rs:LL:CC - = note: inside `std::panicking::r#try::do_call::<[closure@$DIR/bad_unwind.rs:LL:CC: 13:41], ()>` at rustc_src/src/panicking.rs:LL:CC - = note: inside `std::panicking::r#try::<(), [closure@$DIR/bad_unwind.rs:LL:CC: 13:41]>` at rustc_src/src/panicking.rs:LL:CC - = note: inside `std::panic::catch_unwind::<[closure@$DIR/bad_unwind.rs:LL:CC: 13:41], ()>` at rustc_src/src/panic.rs:LL:CC + = note: inside `std::panicking::r#try::do_call::<[closure@$DIR/bad_unwind.rs:LL:CC], ()>` at rustc_src/src/panicking.rs:LL:CC + = note: inside `std::panicking::r#try::<(), [closure@$DIR/bad_unwind.rs:LL:CC]>` at rustc_src/src/panicking.rs:LL:CC + = note: inside `std::panic::catch_unwind::<[closure@$DIR/bad_unwind.rs:LL:CC], ()>` at rustc_src/src/panic.rs:LL:CC note: inside `main` at $DIR/bad_unwind.rs:LL:CC --> $DIR/bad_unwind.rs:LL:CC | diff --git a/tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr b/tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr index 593419fe9b3..804bb0f92af 100644 --- a/tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr +++ b/tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr @@ -13,7 +13,7 @@ note: inside closure at $DIR/deallocate_against_barrier1.rs:LL:CC | LL | drop(unsafe { Box::from_raw(raw) }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - = note: inside `<[closure@$DIR/deallocate_against_barrier1.rs:LL:CC: 12:6] as std::ops::FnOnce<(&mut i32,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC + = note: inside `<[closure@$DIR/deallocate_against_barrier1.rs:LL:CC] as std::ops::FnOnce<(&mut i32,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC note: inside `inner` at $DIR/deallocate_against_barrier1.rs:LL:CC --> $DIR/deallocate_against_barrier1.rs:LL:CC | diff --git a/tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr b/tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr index f6734db7158..41a32a6280a 100644 --- a/tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr +++ b/tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr @@ -13,7 +13,7 @@ note: inside closure at $DIR/deallocate_against_barrier2.rs:LL:CC | LL | drop(unsafe { Box::from_raw(raw) }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - = note: inside `<[closure@$DIR/deallocate_against_barrier2.rs:LL:CC: 16:6] as std::ops::FnOnce<(&std::cell::Cell,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC + = note: inside `<[closure@$DIR/deallocate_against_barrier2.rs:LL:CC] as std::ops::FnOnce<(&std::cell::Cell,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC note: inside `inner` at $DIR/deallocate_against_barrier2.rs:LL:CC --> $DIR/deallocate_against_barrier2.rs:LL:CC | diff --git a/tests/compiletest.rs b/tests/compiletest.rs index 4be658e86cb..cf053fccb47 100644 --- a/tests/compiletest.rs +++ b/tests/compiletest.rs @@ -80,7 +80,7 @@ macro_rules! regexes { regexes! { STDERR: // erase line and column info - r"\.rs:[0-9]+:[0-9]+" => ".rs:LL:CC", + r"\.rs:[0-9]+:[0-9]+(: [0-9]+:[0-9]+)?" => ".rs:LL:CC", // erase alloc ids "alloc[0-9]+" => "ALLOC", // erase Stacked Borrows tags