diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-06-16 14:31:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-16 14:31:10 +0200 |
| commit | c4e11743b255388d311fdee937826d5d239f599b (patch) | |
| tree | a43d9b169f246802373bbf11c8815bbc9500254e /src | |
| parent | 379565835783a26fdf6aec6606c43429c63119d8 (diff) | |
| parent | 38712030ca9d7844ca0ba606be493b4fda08dcaa (diff) | |
| download | rust-c4e11743b255388d311fdee937826d5d239f599b.tar.gz rust-c4e11743b255388d311fdee937826d5d239f599b.zip | |
Rollup merge of #142125 - cberner:file_lock_stable, r=ChrisDenton
Stabilize "file_lock" feature Closes https://github.com/rust-lang/rust/issues/130994 r? ```@joshtriplett```
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/src/lib.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/shims/fs.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 344e12e9fa3..048ed81a816 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -16,7 +16,7 @@ #![feature(unqualified_local_imports)] #![feature(derive_coerce_pointee)] #![feature(arbitrary_self_types)] -#![feature(file_lock)] +#![cfg_attr(bootstrap, feature(file_lock))] // Configure clippy and other lints #![allow( clippy::collapsible_else_if, diff --git a/src/tools/miri/tests/pass/shims/fs.rs b/src/tools/miri/tests/pass/shims/fs.rs index 2f30827c933..9d5725773e6 100644 --- a/src/tools/miri/tests/pass/shims/fs.rs +++ b/src/tools/miri/tests/pass/shims/fs.rs @@ -2,7 +2,6 @@ #![feature(io_error_more)] #![feature(io_error_uncategorized)] -#![feature(file_lock)] use std::collections::BTreeMap; use std::ffi::OsString; |