Skip to content

Commit 7d79da0

Browse files
committed
Auto merge of #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
2 parents df5696b + 6a2e613 commit 7d79da0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/bench.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ test bench_hello ... ")
187187
.with_stderr_contains(format!("\
188188
[COMPILING] foo v0.5.0 ({})
189189
[RUNNING] target[..]release[..]foo-[..]
190-
thread '<main>' panicked at 'assertion failed: \
190+
thread '[..]' panicked at 'assertion failed: \
191191
`(left == right)` (left: \
192192
`\"hello\"`, right: `\"nope\"`)', src[..]foo.rs:14
193193
[..]

tests/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ fn reports_unsuccessful_subcommand_result() {
715715
execs().with_status(0).with_stdout_contains(" fail\n"));
716716
assert_that(cargo_process("fail"),
717717
execs().with_status(101).with_stderr_contains("\
718-
thread '<main>' panicked at 'explicit panic', [..]
718+
thread '[..]' panicked at 'explicit panic', [..]
719719
"));
720720
}
721721

0 commit comments

Comments
 (0)