normalize away some more line numbers

diff --git a/tests/compile-fail/generator-pinned-moved.stderr b/tests/compile-fail/generator-pinned-moved.stderr
index 0ac4f8caa07889a907ec83dcb3afa499a4082c25..56bfc6092b7eba7e46712704ec8ef1ee6b8c136f 100644 (file)
--- 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 `<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC: 16:6]> as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC
+note: inside `<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC]> 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 `<std::boxed::Box<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC: 16:6]>> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC
+   = note: inside `<std::boxed::Box<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC]>> 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 529f4179a8f7eafe42b935057d62188f58f4fe29..5030391bc6eae0ca49cc78c9e3bbb57179b916cd 100644 (file)
--- 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 593419fe9b377fd350b53213b38cd0fe556fcb3a..804bb0f92af84f56ba5126068e056081708355ec 100644 (file)
--- 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 f6734db71588017e4a428fa86e0384b3e883a724..41a32a6280a7a6ea15aee104e8c7c5b16638996b 100644 (file)
--- 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<i32>,)>>::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<i32>,)>>::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 4be658e86cba434a3e74734f80e7a9611c5432fa..cf053fccb478be1549b58796b44b360460bfa7f2 100644 (file)
--- 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