Auto merge of #4246 - est31:master, r=Mark-Simulacrum

Let two further tests tolerate col info in panics Needed by rust-lang/rust#42938 I've now ripgrepped for "panicked at" and found no further test that hardcodes the "filename:line$" format.
rust-lang · Jul 2, 2017 · eb6cf01 · eb6cf01
2 parents 5bf71ab + 02c97af
commit eb6cf01
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/test.rs b/tests/test.rs
@@ -263,7 +263,7 @@ failures:
 
 ---- test_hello stdout ----
 <tab>thread 'test_hello' panicked at 'assertion failed: false', \
-      tests[/]footest.rs:4
+      tests[/]footest.rs:4[..]
 ")
                        .with_stdout_contains("\
 failures:
@@ -295,7 +295,7 @@ failures:
 
 ---- test_hello stdout ----
 <tab>thread 'test_hello' panicked at 'assertion failed: false', \
-      src[/]lib.rs:4
+      src[/]lib.rs:4[..]
 ")
                        .with_stdout_contains("\
 failures: