Rollup merge of #75771 - tmiasko:const-eval-query-stack-normalize, r=…

…jonas-schievink Extend normalization in const-eval-query-stack test Builds with debuginfo have additional information in backtrace.
rust-lang · Aug 22, 2020 · d826229 · d826229
2 parents ad15dc2 + 3b995cc
commit d826229
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/test/ui/consts/const-eval/const-eval-query-stack.rs b/src/test/ui/consts/const-eval/const-eval-query-stack.rs
@@ -9,7 +9,8 @@
 // normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
 // normalize-stderr-test "thread.*panicked.*\n" -> ""
 // normalize-stderr-test "stack backtrace:\n" -> ""
-// normalize-stderr-test "  \d{1,}: .*\n" -> ""
+// normalize-stderr-test "\s\d{1,}: .*\n" -> ""
+// normalize-stderr-test "\s at .*\n" -> ""
 // normalize-stderr-test ".*note: Some details.*\n" -> ""
 
 #![allow(unconditional_panic)]

diff --git a/src/test/ui/consts/const-eval/const-eval-query-stack.stderr b/src/test/ui/consts/const-eval/const-eval-query-stack.stderr
@@ -1,5 +1,5 @@
 error: reaching this expression at runtime will panic or abort
-  --> $DIR/const-eval-query-stack.rs:18:28
+  --> $DIR/const-eval-query-stack.rs:19:28
    |
 LL |     let x: &'static i32 = &(1 / 0);
    |                           -^^^^^^^