Skip to content

Commit c401f3f

Browse files
committed
Auto merge of #140122 - ChrisDenton:rollup-qsj6xu0, r=ChrisDenton
Rollup of 8 pull requests Successful merges: - #139946 (fix missing word in comment) - #139982 (SystemTime doc tweaks) - #140009 (docs(LocalKey<T>): clarify that T's Drop shouldn't panic) - #140021 (Don't ICE on pending obligations from deep normalization in a loop) - #140029 (Relocate tests in `tests/ui`) - #140030 (Fix autodiff debug builds) - #140120 (Use `output_base_dir` for `mir_dump_dir`) - #140121 (Document why CodeStats::type_sizes is public) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 196a078 + 77872bb commit c401f3f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/fail/panic/tls_macro_const_drop_panic.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
thread $NAME panicked at tests/fail/panic/tls_macro_const_drop_panic.rs:LL:CC:
33
ow
4-
fatal runtime error: thread local panicked on drop
4+
fatal runtime error: thread local panicked on drop, aborting
55
error: abnormal termination: the program aborted execution
66

77
error: aborting due to 1 previous error

tests/fail/panic/tls_macro_drop_panic.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
thread $NAME panicked at tests/fail/panic/tls_macro_drop_panic.rs:LL:CC:
33
ow
4-
fatal runtime error: thread local panicked on drop
4+
fatal runtime error: thread local panicked on drop, aborting
55
error: abnormal termination: the program aborted execution
66

77
error: aborting due to 1 previous error

0 commit comments

Comments
 (0)