Skip to content

Commit

Permalink
Rollup merge of rust-lang#48312 - frewsxcv:frewsxcv-section-headings,…
Browse files Browse the repository at this point in the history
… r=QuietMisdreavus

Unify 'Platform-specific behavior' documentation headings.

None
  • Loading branch information
GuillaumeGomez authored Feb 18, 2018
2 parents 04256e7 + 0a798bd commit cc20de3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions src/libstd/net/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ impl TcpStream {
/// indefinitely. It is an error to pass the zero `Duration` to this
/// method.
///
/// # Note
/// # Platform-specific behavior
///
/// Platforms may return a different error code whenever a read times out as
/// a result of setting this option. For example Unix typically returns an
Expand Down Expand Up @@ -293,7 +293,7 @@ impl TcpStream {
/// indefinitely. It is an error to pass the zero [`Duration`] to this
/// method.
///
/// # Note
/// # Platform-specific behavior
///
/// Platforms may return a different error code whenever a write times out
/// as a result of setting this option. For example Unix typically returns
Expand Down Expand Up @@ -323,7 +323,7 @@ impl TcpStream {
///
/// If the timeout is [`None`], then [`read`] calls will block indefinitely.
///
/// # Note
/// # Platform-specific behavior
///
/// Some platforms do not provide access to the current timeout.
///
Expand All @@ -349,7 +349,7 @@ impl TcpStream {
///
/// If the timeout is [`None`], then [`write`] calls will block indefinitely.
///
/// # Note
/// # Platform-specific behavior
///
/// Some platforms do not provide access to the current timeout.
///
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/net/udp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ impl UdpSocket {
/// indefinitely. It is an error to pass the zero [`Duration`] to this
/// method.
///
/// # Note
/// # Platform-specific behavior
///
/// Platforms may return a different error code whenever a read times out as
/// a result of setting this option. For example Unix typically returns an
Expand Down Expand Up @@ -262,7 +262,7 @@ impl UdpSocket {
/// indefinitely. It is an error to pass the zero [`Duration`] to this
/// method.
///
/// # Note
/// # Platform-specific behavior
///
/// Platforms may return a different error code whenever a write times out
/// as a result of setting this option. For example Unix typically returns
Expand Down
6 changes: 3 additions & 3 deletions src/libstd/thread/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ pub fn panicking() -> bool {
/// The thread may sleep longer than the duration specified due to scheduling
/// specifics or platform-dependent functionality.
///
/// # Platform behavior
/// # Platform-specific behavior
///
/// On Unix platforms this function will not return early due to a
/// signal being received or a spurious wakeup.
Expand All @@ -676,7 +676,7 @@ pub fn sleep_ms(ms: u32) {
/// The thread may sleep longer than the duration specified due to scheduling
/// specifics or platform-dependent functionality.
///
/// # Platform behavior
/// # Platform-specific behavior
///
/// On Unix platforms this function will not return early due to a
/// signal being received or a spurious wakeup. Platforms which do not support
Expand Down Expand Up @@ -837,7 +837,7 @@ pub fn park_timeout_ms(ms: u32) {
///
/// See the [park documentation][park] for more details.
///
/// # Platform behavior
/// # Platform-specific behavior
///
/// Platforms which do not support nanosecond precision for sleeping will have
/// `dur` rounded up to the nearest granularity of time they can sleep for.
Expand Down

0 comments on commit cc20de3

Please sign in to comment.