Skip to content

Commit 45d5e0e

Browse files
authored
Unrolled build for rust-lang#136794
Rollup merge of rust-lang#136794 - cberner:stabilize, r=joshtriplett Stabilize file_lock Closes rust-lang#130994
2 parents ed49386 + 82af73d commit 45d5e0e

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

library/std/src/fs.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,6 @@ impl File {
664664
/// # Examples
665665
///
666666
/// ```no_run
667-
/// #![feature(file_lock)]
668667
/// use std::fs::File;
669668
///
670669
/// fn main() -> std::io::Result<()> {
@@ -673,7 +672,7 @@ impl File {
673672
/// Ok(())
674673
/// }
675674
/// ```
676-
#[unstable(feature = "file_lock", issue = "130994")]
675+
#[stable(feature = "file_lock", since = "CURRENT_RUSTC_VERSION")]
677676
pub fn lock(&self) -> io::Result<()> {
678677
self.inner.lock()
679678
}
@@ -717,7 +716,6 @@ impl File {
717716
/// # Examples
718717
///
719718
/// ```no_run
720-
/// #![feature(file_lock)]
721719
/// use std::fs::File;
722720
///
723721
/// fn main() -> std::io::Result<()> {
@@ -726,7 +724,7 @@ impl File {
726724
/// Ok(())
727725
/// }
728726
/// ```
729-
#[unstable(feature = "file_lock", issue = "130994")]
727+
#[stable(feature = "file_lock", since = "CURRENT_RUSTC_VERSION")]
730728
pub fn lock_shared(&self) -> io::Result<()> {
731729
self.inner.lock_shared()
732730
}
@@ -775,7 +773,6 @@ impl File {
775773
/// # Examples
776774
///
777775
/// ```no_run
778-
/// #![feature(file_lock)]
779776
/// use std::fs::File;
780777
///
781778
/// fn main() -> std::io::Result<()> {
@@ -784,7 +781,7 @@ impl File {
784781
/// Ok(())
785782
/// }
786783
/// ```
787-
#[unstable(feature = "file_lock", issue = "130994")]
784+
#[stable(feature = "file_lock", since = "CURRENT_RUSTC_VERSION")]
788785
pub fn try_lock(&self) -> io::Result<bool> {
789786
self.inner.try_lock()
790787
}
@@ -832,7 +829,6 @@ impl File {
832829
/// # Examples
833830
///
834831
/// ```no_run
835-
/// #![feature(file_lock)]
836832
/// use std::fs::File;
837833
///
838834
/// fn main() -> std::io::Result<()> {
@@ -841,7 +837,7 @@ impl File {
841837
/// Ok(())
842838
/// }
843839
/// ```
844-
#[unstable(feature = "file_lock", issue = "130994")]
840+
#[stable(feature = "file_lock", since = "CURRENT_RUSTC_VERSION")]
845841
pub fn try_lock_shared(&self) -> io::Result<bool> {
846842
self.inner.try_lock_shared()
847843
}
@@ -869,7 +865,6 @@ impl File {
869865
/// # Examples
870866
///
871867
/// ```no_run
872-
/// #![feature(file_lock)]
873868
/// use std::fs::File;
874869
///
875870
/// fn main() -> std::io::Result<()> {
@@ -879,7 +874,7 @@ impl File {
879874
/// Ok(())
880875
/// }
881876
/// ```
882-
#[unstable(feature = "file_lock", issue = "130994")]
877+
#[stable(feature = "file_lock", since = "CURRENT_RUSTC_VERSION")]
883878
pub fn unlock(&self) -> io::Result<()> {
884879
self.inner.unlock()
885880
}

0 commit comments

Comments
 (0)