Auto merge of rust-lang#2747 - WiSaGaN:feature/rename-main-thread, r=…

…alexcrichton Rename main thread from '<main>' to 'main'. This pull request resolves the test failure in rust pull request 33803 rust-lang/rust#33803
alexcrichton · May 31, 2016 · 7d79da0 · 7d79da0
2 parents df5696b + 6a2e613
commit 7d79da0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/bench.rs b/tests/bench.rs
@@ -187,7 +187,7 @@ test bench_hello ... ")
                        .with_stderr_contains(format!("\
 [COMPILING] foo v0.5.0 ({})
 [RUNNING] target[..]release[..]foo-[..]
-thread '<main>' panicked at 'assertion failed: \
+thread '[..]' panicked at 'assertion failed: \
     `(left == right)` (left: \
     `\"hello\"`, right: `\"nope\"`)', src[..]foo.rs:14
 [..]

diff --git a/tests/install.rs b/tests/install.rs
@@ -715,7 +715,7 @@ fn reports_unsuccessful_subcommand_result() {
                 execs().with_status(0).with_stdout_contains("    fail\n"));
     assert_that(cargo_process("fail"),
                 execs().with_status(101).with_stderr_contains("\
-thread '<main>' panicked at 'explicit panic', [..]
+thread '[..]' panicked at 'explicit panic', [..]
 "));
 }