diff options
| author | bors <bors@rust-lang.org> | 2020-07-26 16:09:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-26 16:09:42 +0000 |
| commit | c367798cfd3817ca6ae908ce675d1d99242af148 (patch) | |
| tree | 3c697026c11f13b35d61371c36921e6b3d1de1ca /src/test/ui/mir | |
| parent | 14485ee1257703df51313efe39daf35e886e4dac (diff) | |
| parent | 41895ca93f3722adf5855089442de3abc94458f0 (diff) | |
| download | rust-1.45.1.tar.gz rust-1.45.1.zip | |
Auto merge of #74746 - wesleywiser:stable_backport_73669, r=Mark-Simulacrum 1.45.1
Stable backport of #73613 This is the backport of #73613 to stable. r? @ghost cc @Mark-Simulacrum In addition the tests added in the original PR passing, I've also confirmed that the test case in #74739 works correctly.
Diffstat (limited to 'src/test/ui/mir')
| -rw-r--r-- | src/test/ui/mir/mir_detects_invalid_ops.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/mir/mir_detects_invalid_ops.stderr | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/test/ui/mir/mir_detects_invalid_ops.rs b/src/test/ui/mir/mir_detects_invalid_ops.rs index 0940dbe6a5e..136c03cd9f1 100644 --- a/src/test/ui/mir/mir_detects_invalid_ops.rs +++ b/src/test/ui/mir/mir_detects_invalid_ops.rs @@ -19,6 +19,6 @@ fn mod_by_zero() { fn oob_error_for_slices() { let a: *const [_] = &[1, 2, 3]; unsafe { - let _b = (*a)[3]; //~ ERROR this operation will panic at runtime [unconditional_panic] + let _b = (*a)[3]; } } diff --git a/src/test/ui/mir/mir_detects_invalid_ops.stderr b/src/test/ui/mir/mir_detects_invalid_ops.stderr index 41f03789f23..0b6dbfd7c3d 100644 --- a/src/test/ui/mir/mir_detects_invalid_ops.stderr +++ b/src/test/ui/mir/mir_detects_invalid_ops.stderr @@ -12,11 +12,5 @@ error: this operation will panic at runtime LL | let _z = 1 % y; | ^^^^^ attempt to calculate the remainder with a divisor of zero -error: this operation will panic at runtime - --> $DIR/mir_detects_invalid_ops.rs:22:18 - | -LL | let _b = (*a)[3]; - | ^^^^^^^ index out of bounds: the len is 3 but the index is 3 - -error: aborting due to 3 previous errors +error: aborting due to 2 previous errors |