diff options
| author | bors <bors@rust-lang.org> | 2022-10-10 15:57:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-10 15:57:05 +0000 |
| commit | e7785f6dfc1b1f46ca8c0bfe737d3d8b077fc9c0 (patch) | |
| tree | 1657398da8eaf740a3c282918bce2d39cd2d3e2a | |
| parent | 3bcd276fa07de0da499bd71c378abe685f64f88e (diff) | |
| parent | 1f123d77c7d6dd21aa6597135743a12573e01d25 (diff) | |
| download | rust-e7785f6dfc1b1f46ca8c0bfe737d3d8b077fc9c0.tar.gz rust-e7785f6dfc1b1f46ca8c0bfe737d3d8b077fc9c0.zip | |
Auto merge of #2591 - RalfJung:rustup, r=RalfJung
Rustup
| -rw-r--r-- | src/tools/miri/cargo-miri/src/main.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/lib.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/shims/fs/isolated_file.stderr | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/miri/cargo-miri/src/main.rs b/src/tools/miri/cargo-miri/src/main.rs index c43bf0bfab1..9b5fa7ae873 100644 --- a/src/tools/miri/cargo-miri/src/main.rs +++ b/src/tools/miri/cargo-miri/src/main.rs @@ -1,4 +1,3 @@ -#![cfg_attr(bootstrap, feature(let_else))] #![allow(clippy::useless_format, clippy::derive_partial_eq_without_eq, rustc::internal)] #[macro_use] diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index 028fcd55e9c..89a02096550 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -f382c2748aec2ada91eff88840c996644ff0f70d +0265a3e93bf1b89d97cae113ed214954d5c35e22 diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 8e2222c39a2..904118eac78 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -10,7 +10,6 @@ #![feature(is_some_and)] #![feature(nonzero_ops)] #![feature(local_key_cell_methods)] -#![cfg_attr(bootstrap, feature(let_else))] // Configure clippy and other lints #![allow( clippy::collapsible_else_if, diff --git a/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr b/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr index 4e3fdc7a458..269b1383aad 100644 --- a/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr +++ b/src/tools/miri/tests/fail/shims/fs/isolated_file.stderr @@ -10,6 +10,9 @@ LL | let fd = cvt_r(|| unsafe { open64(path.as_ptr(), flags, opts.mode a = note: inside closure at RUSTLIB/std/src/sys/PLATFORM/fs.rs:LL:CC = note: inside `std::sys::PLATFORM::cvt_r::<i32, [closure@std::sys::PLATFORM::fs::File::open_c::{closure#0}]>` at RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC = note: inside `std::sys::PLATFORM::fs::File::open_c` at RUSTLIB/std/src/sys/PLATFORM/fs.rs:LL:CC + = note: inside closure at RUSTLIB/std/src/sys/PLATFORM/fs.rs:LL:CC + = note: inside `std::sys::PLATFORM::small_c_string::run_with_cstr::<std::sys::PLATFORM::fs::File, [closure@std::sys::PLATFORM::fs::File::open::{closure#0}]>` at RUSTLIB/std/src/sys/PLATFORM/small_c_string.rs:LL:CC + = note: inside `std::sys::PLATFORM::small_c_string::run_path_with_cstr::<std::sys::PLATFORM::fs::File, [closure@std::sys::PLATFORM::fs::File::open::{closure#0}]>` at RUSTLIB/std/src/sys/PLATFORM/small_c_string.rs:LL:CC = note: inside `std::sys::PLATFORM::fs::File::open` at RUSTLIB/std/src/sys/PLATFORM/fs.rs:LL:CC = note: inside `std::fs::OpenOptions::_open` at RUSTLIB/std/src/fs.rs:LL:CC = note: inside `std::fs::OpenOptions::open::<&std::path::Path>` at RUSTLIB/std/src/fs.rs:LL:CC |