From 5de45607a5b3e73daca887cda8825bc1fd9102dd Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sun, 15 Nov 2020 05:01:10 +0100
Subject: [PATCH] Normalize column numbers

---
 tests/run-pass/backtrace-std.rs     |  2 +-
 tests/run-pass/backtrace-std.stderr | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/run-pass/backtrace-std.rs b/tests/run-pass/backtrace-std.rs
index 7a793e092a..9b61aabab3 100644
--- a/tests/run-pass/backtrace-std.rs
+++ b/tests/run-pass/backtrace-std.rs
@@ -1,5 +1,5 @@
 // normalize-stderr-test "at .*/(rust[^/]*|checkout)/library/" -> "at RUSTLIB/"
-// normalize-stderr-test "RUSTLIB/(.*):\d+"-> "RUSTLIB/$1:LL"
+// normalize-stderr-test "RUSTLIB/([^:]*):\d+:\d+"-> "RUSTLIB/$1:LL:CC"
 // normalize-stderr-test "::<.*>" -> ""
 // compile-flags: -Zmiri-disable-isolation
 
diff --git a/tests/run-pass/backtrace-std.stderr b/tests/run-pass/backtrace-std.stderr
index 45c46acc33..09f035b972 100644
--- a/tests/run-pass/backtrace-std.stderr
+++ b/tests/run-pass/backtrace-std.stderr
@@ -1,28 +1,28 @@
    0: func_d
-             at $DIR/backtrace-std.rs:18
+             at $DIR/backtrace-std.rs:18:45
    1: func_c
-             at $DIR/backtrace-std.rs:17
+             at $DIR/backtrace-std.rs:17:45
    2: func_b
-             at $DIR/backtrace-std.rs:11
+             at $DIR/backtrace-std.rs:11:48
    3: func_a
-             at $DIR/backtrace-std.rs:10
+             at $DIR/backtrace-std.rs:10:45
    4: main
-             at $DIR/backtrace-std.rs:21
+             at $DIR/backtrace-std.rs:21:19
    5: <fn() as std::ops::FnOnce<()>>::call_once - shim(fn())
-             at RUSTLIB/core/src/ops/function.rs:LL
+             at RUSTLIB/core/src/ops/function.rs:LL:CC
    6: std::sys_common::backtrace::__rust_begin_short_backtrace
-             at RUSTLIB/std/src/sys_common/backtrace.rs:LL
+             at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
    7: std::rt::lang_start::{closure#0}
-             at RUSTLIB/std/src/rt.rs:LL
+             at RUSTLIB/std/src/rt.rs:LL:CC
    8: std::ops::function::impls::call_once
-             at RUSTLIB/core/src/ops/function.rs:LL
+             at RUSTLIB/core/src/ops/function.rs:LL:CC
    9: std::panicking::r#try::do_call
-             at RUSTLIB/std/src/panicking.rs:LL
+             at RUSTLIB/std/src/panicking.rs:LL:CC
   10: std::panicking::r#try
-             at RUSTLIB/std/src/panicking.rs:LL
+             at RUSTLIB/std/src/panicking.rs:LL:CC
   11: std::panic::catch_unwind
-             at RUSTLIB/std/src/panic.rs:LL
+             at RUSTLIB/std/src/panic.rs:LL:CC
   12: std::rt::lang_start_internal
-             at RUSTLIB/std/src/rt.rs:LL
+             at RUSTLIB/std/src/rt.rs:LL:CC
   13: std::rt::lang_start
-             at RUSTLIB/std/src/rt.rs:LL
+             at RUSTLIB/std/src/rt.rs:LL:CC