diff options
| author | bors <bors@rust-lang.org> | 2023-04-22 08:37:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-22 08:37:23 +0000 |
| commit | 213c905cadc138fa04d0ed50b6382a2fe3f7bb9f (patch) | |
| tree | a1b37c889d1f6b74d2561c69fbf69b9e8e0f3545 | |
| parent | 2b066a3bba88ac2dd9299410ccdbf27f5ad347e8 (diff) | |
| parent | cf3255865ff4a7920e3daf84be156e6cb660cdf9 (diff) | |
| download | rust-213c905cadc138fa04d0ed50b6382a2fe3f7bb9f.tar.gz rust-213c905cadc138fa04d0ed50b6382a2fe3f7bb9f.zip | |
Auto merge of #2849 - RalfJung:rustup, r=RalfJung
Rustup
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/const-ub-checks.stderr | 6 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/erroneous_const2.stderr | 14 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index 6e0092308fa..7ea0a3e3a3e 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -53ac4f8e2fc15e49ef3a04f98622a9b9db755fd4 +3128fd8ddfde44f09f7c3920c552122f5aec2395 diff --git a/src/tools/miri/tests/fail/const-ub-checks.stderr b/src/tools/miri/tests/fail/const-ub-checks.stderr index a8b7ea242b9..596a6bb4ca8 100644 --- a/src/tools/miri/tests/fail/const-ub-checks.stderr +++ b/src/tools/miri/tests/fail/const-ub-checks.stderr @@ -4,6 +4,12 @@ error[E0080]: evaluation of constant value failed LL | ptr.read(); | ^^^^^^^^^^ accessing memory with alignment ALIGN, but alignment ALIGN is required +note: erroneous constant used + --> $DIR/const-ub-checks.rs:LL:CC + | +LL | let _x = UNALIGNED_READ; + | ^^^^^^^^^^^^^^ + error: aborting due to previous error For more information about this error, try `rustc --explain E0080`. diff --git a/src/tools/miri/tests/fail/erroneous_const2.stderr b/src/tools/miri/tests/fail/erroneous_const2.stderr index d41fcfd2302..9aad1fc9b02 100644 --- a/src/tools/miri/tests/fail/erroneous_const2.stderr +++ b/src/tools/miri/tests/fail/erroneous_const2.stderr @@ -4,6 +4,20 @@ error[E0080]: evaluation of constant value failed LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ^^^^^ attempt to compute `5_u32 - 6_u32`, which would overflow +note: erroneous constant used + --> $DIR/erroneous_const2.rs:LL:CC + | +LL | println!("{}", FOO); + | ^^^ + +note: erroneous constant used + --> $DIR/erroneous_const2.rs:LL:CC + | +LL | println!("{}", FOO); + | ^^^ + | + = note: this note originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info) + error: aborting due to previous error For more information about this error, try `rustc --explain E0080`. |