diff options
| author | bors <bors@rust-lang.org> | 2024-03-31 05:44:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-31 05:44:17 +0000 |
| commit | d5de305fef8065d3af726537db2513a884ed2bcc (patch) | |
| tree | 70ea36b7fd5f777449cc0622edc1f960490a2747 /src/tools | |
| parent | 723acede108580cdd6a848342ef3049f687f197e (diff) | |
| parent | eb8e8c06b6c6ab90b6ecbed1ac3820304c53ef01 (diff) | |
| download | rust-d5de305fef8065d3af726537db2513a884ed2bcc.tar.gz rust-d5de305fef8065d3af726537db2513a884ed2bcc.zip | |
Auto merge of #3435 - rust-lang:rustup-2024-03-31, r=saethlin
Automatic Rustup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/lib.rs | 4 | ||||
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass-dep/shims/posix_memalign.rs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/lib.rs b/src/tools/compiletest/src/lib.rs index b791b38379f..1624e2a6084 100644 --- a/src/tools/compiletest/src/lib.rs +++ b/src/tools/compiletest/src/lib.rs @@ -571,7 +571,9 @@ pub fn make_tests( &modified_tests, &mut poisoned, ) - .unwrap_or_else(|_| panic!("Could not read tests from {}", config.src_base.display())); + .unwrap_or_else(|reason| { + panic!("Could not read tests from {}: {reason}", config.src_base.display()) + }); if poisoned { eprintln!(); diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index 3679f56c0c0..187756851c7 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -69fa40cb48384fad7930dce2d9a20d18fe4d1b51 +5baf1e13f568b61e121953bf6a3d09faee7dd446 diff --git a/src/tools/miri/tests/pass-dep/shims/posix_memalign.rs b/src/tools/miri/tests/pass-dep/shims/posix_memalign.rs index 5cf62995fbe..db66b213416 100644 --- a/src/tools/miri/tests/pass-dep/shims/posix_memalign.rs +++ b/src/tools/miri/tests/pass-dep/shims/posix_memalign.rs @@ -1,6 +1,6 @@ //@ignore-target-windows: No libc on Windows -#![feature(pointer_is_aligned)] +#![feature(pointer_is_aligned_to)] #![feature(strict_provenance)] use core::ptr; |