Merge pull request #4402 from rust-lang/rustup-2025-06-17

Automatic Rustup

Author: RalfJung

rust-version

@@ -1 +1 @@
-0cbc0764380630780a275c437260e4d4d5f28c92
+55d436467c351b56253deeba209ae2553d1c243f

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,

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;