Skip to content

Commit ac61022

Browse files
author
The Miri Conjob Bot
committed
Merge from rustc
2 parents 06bb371 + 0556996 commit ac61022

36 files changed

+123
-50
lines changed

src/mono_hash_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! otherwise mutated. We also box items in the map. This means we can safely provide
33
//! shared references into existing items in the `FxHashMap`, because they will not be dropped
44
//! (from being removed) or moved (because they are boxed).
5-
//! The API is is completely tailored to what `memory.rs` needs. It is still in
5+
//! The API is completely tailored to what `memory.rs` needs. It is still in
66
//! a separate file to minimize the amount of code that has to care about the unsafety.
77
88
use std::borrow::Borrow;

tests/fail/concurrency/unwind_top_of_stack.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread '<unnamed>' panicked at 'explicit panic', $DIR/unwind_top_of_stack.rs:LL:CC
1+
thread '<unnamed>' panicked at $DIR/unwind_top_of_stack.rs:LL:CC:
2+
explicit panic
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: Undefined Behavior: unwinding past the topmost frame of the stack
45
--> $DIR/unwind_top_of_stack.rs:LL:CC

tests/fail/function_calls/exported_symbol_bad_unwind1.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread 'main' panicked at 'explicit panic', $DIR/exported_symbol_bad_unwind1.rs:LL:CC
1+
thread 'main' panicked at $DIR/exported_symbol_bad_unwind1.rs:LL:CC:
2+
explicit panic
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
45
--> $DIR/exported_symbol_bad_unwind1.rs:LL:CC

tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread 'main' panicked at 'explicit panic', $DIR/exported_symbol_bad_unwind2.rs:LL:CC
1+
thread 'main' panicked at $DIR/exported_symbol_bad_unwind2.rs:LL:CC:
2+
explicit panic
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: abnormal termination: panic in a function that cannot unwind
45
--> $DIR/exported_symbol_bad_unwind2.rs:LL:CC

tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread 'main' panicked at 'explicit panic', $DIR/exported_symbol_bad_unwind2.rs:LL:CC
1+
thread 'main' panicked at $DIR/exported_symbol_bad_unwind2.rs:LL:CC:
2+
explicit panic
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: abnormal termination: panic in a function that cannot unwind
45
--> $DIR/exported_symbol_bad_unwind2.rs:LL:CC

tests/fail/function_calls/exported_symbol_bad_unwind2.extern_block.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread 'main' panicked at 'explicit panic', $DIR/exported_symbol_bad_unwind2.rs:LL:CC
1+
thread 'main' panicked at $DIR/exported_symbol_bad_unwind2.rs:LL:CC:
2+
explicit panic
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
45
--> $DIR/exported_symbol_bad_unwind2.rs:LL:CC

tests/fail/panic/bad_unwind.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread 'main' panicked at 'explicit panic', $DIR/bad_unwind.rs:LL:CC
1+
thread 'main' panicked at $DIR/bad_unwind.rs:LL:CC:
2+
explicit panic
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
45
--> $DIR/bad_unwind.rs:LL:CC

tests/fail/panic/double_panic.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
thread 'main' panicked at 'first', $DIR/double_panic.rs:LL:CC
1+
thread 'main' panicked at $DIR/double_panic.rs:LL:CC:
2+
first
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
3-
thread 'main' panicked at 'second', $DIR/double_panic.rs:LL:CC
4+
thread 'main' panicked at $DIR/double_panic.rs:LL:CC:
5+
second
46
stack backtrace:
57
error: abnormal termination: panic in a function that cannot unwind
68
--> $DIR/double_panic.rs:LL:CC

tests/fail/panic/no_std.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
panicked at 'blarg I am dead', $DIR/no_std.rs:LL:CC
1+
panicked at $DIR/no_std.rs:LL:CC:
2+
blarg I am dead
23
error: abnormal termination: the program aborted execution
34
--> $DIR/no_std.rs:LL:CC
45
|

tests/fail/panic/panic_abort1.stderr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
thread 'main' panicked at 'panicking from libstd', $DIR/panic_abort1.rs:LL:CC
1+
thread 'main' panicked at $DIR/panic_abort1.rs:LL:CC:
2+
panicking from libstd
23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
34
error: abnormal termination: the program aborted execution
45
--> RUSTLIB/panic_abort/src/lib.rs:LL:CC

0 commit comments

Comments
 (0)