Skip to content

Commit 2dd27da

Browse files
authored
Rollup merge of #142125 - cberner:file_lock_stable, r=ChrisDenton
Stabilize "file_lock" feature Closes rust-lang/rust#130994 r? ```@joshtriplett```
2 parents bfb37d2 + 2a53996 commit 2dd27da

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![feature(unqualified_local_imports)]
1717
#![feature(derive_coerce_pointee)]
1818
#![feature(arbitrary_self_types)]
19-
#![feature(file_lock)]
19+
#![cfg_attr(bootstrap, feature(file_lock))]
2020
// Configure clippy and other lints
2121
#![allow(
2222
clippy::collapsible_else_if,

tests/pass/shims/fs.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#![feature(io_error_more)]
44
#![feature(io_error_uncategorized)]
5-
#![feature(file_lock)]
65

76
use std::collections::BTreeMap;
87
use std::ffi::OsString;

0 commit comments

Comments
 (0)