Skip to content

Commit b5cdfa6

Browse files
joshtriplettgitbot
authored and
gitbot
committed
Reorder "This lock may be advisory or mandatory." earlier in the lock docs
1 parent e48e279 commit b5cdfa6

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

std/src/fs.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -628,17 +628,17 @@ impl File {
628628
///
629629
/// This acquires an exclusive lock; no other file handle to this file may acquire another lock.
630630
///
631+
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
632+
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
633+
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
634+
/// cause non-lockholders to block.
635+
///
631636
/// If this file handle/descriptor, or a clone of it, already holds an lock the exact behavior
632637
/// is unspecified and platform dependent, including the possibility that it will deadlock.
633638
/// However, if this method returns, then an exclusive lock is held.
634639
///
635640
/// If the file not open for writing, it is unspecified whether this function returns an error.
636641
///
637-
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
638-
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
639-
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
640-
/// cause non-lockholders to block.
641-
///
642642
/// The lock will be released when this file (along with any other file descriptors/handles
643643
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
644644
///
@@ -683,15 +683,15 @@ impl File {
683683
/// This acquires a shared lock; more than one file handle may hold a shared lock, but none may
684684
/// hold an exclusive lock at the same time.
685685
///
686-
/// If this file handle/descriptor, or a clone of it, already holds an lock, the exact behavior
687-
/// is unspecified and platform dependent, including the possibility that it will deadlock.
688-
/// However, if this method returns, then a shared lock is held.
689-
///
690686
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
691687
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
692688
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
693689
/// cause non-lockholders to block.
694690
///
691+
/// If this file handle/descriptor, or a clone of it, already holds an lock, the exact behavior
692+
/// is unspecified and platform dependent, including the possibility that it will deadlock.
693+
/// However, if this method returns, then a shared lock is held.
694+
///
695695
/// The lock will be released when this file (along with any other file descriptors/handles
696696
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
697697
///
@@ -738,17 +738,17 @@ impl File {
738738
///
739739
/// This acquires an exclusive lock; no other file handle to this file may acquire another lock.
740740
///
741+
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
742+
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
743+
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
744+
/// cause non-lockholders to block.
745+
///
741746
/// If this file handle/descriptor, or a clone of it, already holds an lock, the exact behavior
742747
/// is unspecified and platform dependent, including the possibility that it will deadlock.
743748
/// However, if this method returns `Ok(true)`, then it has acquired an exclusive lock.
744749
///
745750
/// If the file not open for writing, it is unspecified whether this function returns an error.
746751
///
747-
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
748-
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
749-
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
750-
/// cause non-lockholders to block.
751-
///
752752
/// The lock will be released when this file (along with any other file descriptors/handles
753753
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
754754
///
@@ -797,15 +797,15 @@ impl File {
797797
/// This acquires a shared lock; more than one file handle may hold a shared lock, but none may
798798
/// hold an exclusive lock at the same time.
799799
///
800-
/// If this file handle, or a clone of it, already holds an lock, the exact behavior is
801-
/// unspecified and platform dependent, including the possibility that it will deadlock.
802-
/// However, if this method returns `Ok(true)`, then it has acquired a shared lock.
803-
///
804800
/// This lock may be advisory or mandatory. This lock is meant to interact with [`lock`],
805801
/// [`try_lock`], [`lock_shared`], [`try_lock_shared`], and [`unlock`]. Its interactions with
806802
/// other methods, such as [`read`] and [`write`] are platform specific, and it may or may not
807803
/// cause non-lockholders to block.
808804
///
805+
/// If this file handle, or a clone of it, already holds an lock, the exact behavior is
806+
/// unspecified and platform dependent, including the possibility that it will deadlock.
807+
/// However, if this method returns `Ok(true)`, then it has acquired a shared lock.
808+
///
809809
/// The lock will be released when this file (along with any other file descriptors/handles
810810
/// duplicated or inherited from it) is closed, or if the [`unlock`] method is called.
811811
///

0 commit comments

Comments
 (0)