Skip to content

Commit c2bd2ec

Browse files
committed
Auto merge of #142574 - Kobzol:rollup-ldj386u, r=Kobzol
Rollup of 12 pull requests Successful merges: - rust-lang/rust#141639 (Expose discriminant values in stable_mir) - rust-lang/rust#142082 (Refactor `rustc_attr_data_structures` documentation) - rust-lang/rust#142125 (Stabilize "file_lock" feature) - rust-lang/rust#142236 (Add documentation for `PathBuf`'s `FromIterator` and `Extend` impls) - rust-lang/rust#142373 (Fix Debug for Location) - rust-lang/rust#142416 (Assorted bootstrap cleanups (step 2)) - rust-lang/rust#142431 (Add initial version of snapshot tests to bootstrap) - rust-lang/rust#142450 (Add documentation on top of `rustc_middle/src/query/mod.rs`) - rust-lang/rust#142528 (clarify `rustc_do_not_const_check` comment) - rust-lang/rust#142530 (use `if let` guards where possible) - rust-lang/rust#142561 (Remove an `njn:` comment accidentaly left behind.) - rust-lang/rust#142566 (Fix `-nopt` CI jobs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4313fec + 925df07 commit c2bd2ec

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)