From 17e16aad62ad06ea1f8bc1bac81c73528f48a3d3 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 30 Sep 2020 09:59:28 +0200
Subject: [PATCH] normalize backtrace stderr even more

---
 rust-version                        |  2 +-
 tests/run-pass/backtrace-api.rs     |  2 +-
 tests/run-pass/backtrace-api.stderr | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rust-version b/rust-version
index 049d0f2c878..1b85e41c8ba 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-26373fb4baa9c5b8a7a1e2821fcfa930a85d327d
+c0127e4dbf3a9d3a67ddb1da19f8441019aab8f8
diff --git a/tests/run-pass/backtrace-api.rs b/tests/run-pass/backtrace-api.rs
index be1971efe28..80e64c2e1c8 100644
--- a/tests/run-pass/backtrace-api.rs
+++ b/tests/run-pass/backtrace-api.rs
@@ -1,4 +1,4 @@
-// normalize-stderr-test ".*rustlib" -> "RUSTLIB"
+// normalize-stderr-test ".*/(rust|checkout)/library/" -> "RUSTLIB/"
 // normalize-stderr-test "RUSTLIB/(.*):\d+:\d+ "-> "RUSTLIB/$1:LL:COL "
 // normalize-stderr-test "::<.*>" -> ""
 
diff --git a/tests/run-pass/backtrace-api.stderr b/tests/run-pass/backtrace-api.stderr
index ea25267a1b1..15851a1cc72 100644
--- a/tests/run-pass/backtrace-api.stderr
+++ b/tests/run-pass/backtrace-api.stderr
@@ -2,12 +2,12 @@ $DIR/backtrace-api.rs:21:59 (func_c)
 $DIR/backtrace-api.rs:20:53 (func_b)
 $DIR/backtrace-api.rs:19:50 (func_a)
 $DIR/backtrace-api.rs:25:18 (main)
-RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
-RUSTLIB/src/rust/library/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace)
-RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start::{closure#0})
-RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once)
-RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call)
-RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try)
-RUSTLIB/src/rust/library/std/src/panic.rs:LL:COL (std::panic::catch_unwind)
-RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start_internal)
-RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start)
+RUSTLIB/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
+RUSTLIB/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace)
+RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start::{closure#0})
+RUSTLIB/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once)
+RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call)
+RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try)
+RUSTLIB/std/src/panic.rs:LL:COL (std::panic::catch_unwind)
+RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start_internal)
+RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start)
-- 
2.44.0