Skip to content

Commit dea3e13

Browse files
committed
revert accidental change
1 parent 8bf3251 commit dea3e13

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/tools/miri/src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ pub fn report_error<'tcx>(
382382
helps.push(note_span!(span, "{:?} was deallocated here:", alloc_id));
383383
}
384384
}
385-
AbiMismatchArgument { .. } => {
385+
AbiMismatchArgument { .. } | AbiMismatchReturn { .. } => {
386386
helps.push(note!("this means these two types are not *guaranteed* to be ABI-compatible across all targets"));
387387
helps.push(note!("if you think this code should be accepted anyway, please report an issue with Miri"));
388388
}

src/tools/miri/tests/fail/function_pointers/abi_mismatch_return_type.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LL | g()
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
9+
= help: this means these two types are not *guaranteed* to be ABI-compatible across all targets
10+
= help: if you think this code should be accepted anyway, please report an issue with Miri
911
= note: BACKTRACE:
1012
= note: inside `main` at tests/fail/function_pointers/abi_mismatch_return_type.rs:LL:CC
1113

src/tools/miri/tests/fail/shims/return_type_mismatch.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LL | close(fd);
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
9+
= help: this means these two types are not *guaranteed* to be ABI-compatible across all targets
10+
= help: if you think this code should be accepted anyway, please report an issue with Miri
911
= note: BACKTRACE:
1012
= note: inside `main` at tests/fail/shims/return_type_mismatch.rs:LL:CC
1113

0 commit comments

Comments
 (0)