diff options
| author | bors <bors@rust-lang.org> | 2020-09-12 09:34:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-12 09:34:37 +0000 |
| commit | 2d6cbd21b2c5819c7fa42eb5a3713667b67e4f03 (patch) | |
| tree | 4d75c6781771701eaa7c64fef207d00a354e05e0 /library/std/src | |
| parent | 2e2e7dec73a210dd7699496daf81a9442b69371b (diff) | |
| parent | 0ed4bc59931ac4ec35c50aa7faafe42cbec9efb0 (diff) | |
Auto merge of #76637 - RalfJung:rollup-eaykf93, r=RalfJung
Rollup of 7 pull requests Successful merges: - #76114 (Add saturating methods for `Duration`) - #76297 (rustdoc: fix min_const_generics with ty::Param) - #76484 (Add MaybeUninit::assume_init_drop.) - #76530 (Eliminate mut reference UB in Drop impl for Rc<T>) - #76583 (Update `std::os` module documentation.) - #76599 (Finish off revisions for const generics UI tests.) - #76615 (Add missing examples on binary core traits) Failed merges: r? `@ghost`
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/os/linux/fs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/linux/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/linux/raw.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/ext/ffi.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/ext/io.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/unix/ext/net.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/unix/ext/raw.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/windows/ext/io.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/windows/ext/raw.rs | 2 |
9 files changed, 12 insertions, 8 deletions
diff --git a/library/std/src/os/linux/fs.rs b/library/std/src/os/linux/fs.rs index 14719a9be5e..ff23c3d67e3 100644 --- a/library/std/src/os/linux/fs.rs +++ b/library/std/src/os/linux/fs.rs @@ -1,3 +1,5 @@ +//! Linux-specific extensions to primitives in the `std::fs` module. + #![stable(feature = "metadata_ext", since = "1.1.0")] use crate::fs::Metadata; diff --git a/library/std/src/os/linux/mod.rs b/library/std/src/os/linux/mod.rs index d35307162cc..f179a524336 100644 --- a/library/std/src/os/linux/mod.rs +++ b/library/std/src/os/linux/mod.rs @@ -1,4 +1,4 @@ -//! Linux-specific definitions +//! Linux-specific definitions. #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/library/std/src/os/linux/raw.rs b/library/std/src/os/linux/raw.rs index 1950ffcb21b..a007fd2b6be 100644 --- a/library/std/src/os/linux/raw.rs +++ b/library/std/src/os/linux/raw.rs @@ -1,4 +1,4 @@ -//! Linux-specific raw type definitions +//! Linux-specific raw type definitions. #![stable(feature = "raw_ext", since = "1.1.0")] #![rustc_deprecated( diff --git a/library/std/src/sys/unix/ext/ffi.rs b/library/std/src/sys/unix/ext/ffi.rs index 76b34a6b5d8..123f85deaf9 100644 --- a/library/std/src/sys/unix/ext/ffi.rs +++ b/library/std/src/sys/unix/ext/ffi.rs @@ -1,4 +1,4 @@ -//! Unix-specific extension to the primitives in the `std::ffi` module +//! Unix-specific extension to the primitives in the `std::ffi` module. //! //! # Examples //! diff --git a/library/std/src/sys/unix/ext/io.rs b/library/std/src/sys/unix/ext/io.rs index 5077e2e28d1..ec7a32b675c 100644 --- a/library/std/src/sys/unix/ext/io.rs +++ b/library/std/src/sys/unix/ext/io.rs @@ -1,4 +1,4 @@ -//! Unix-specific extensions to general I/O primitives +//! Unix-specific extensions to general I/O primitives. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/library/std/src/sys/unix/ext/net.rs b/library/std/src/sys/unix/ext/net.rs index 3fbd0cb58b1..320378e30cc 100644 --- a/library/std/src/sys/unix/ext/net.rs +++ b/library/std/src/sys/unix/ext/net.rs @@ -1,6 +1,6 @@ -#![stable(feature = "unix_socket", since = "1.10.0")] +//! Unix-specific networking functionality. -//! Unix-specific networking functionality +#![stable(feature = "unix_socket", since = "1.10.0")] #[cfg(all(test, not(target_os = "emscripten")))] mod tests; diff --git a/library/std/src/sys/unix/ext/raw.rs b/library/std/src/sys/unix/ext/raw.rs index 40fa53d484f..3199a0bff0b 100644 --- a/library/std/src/sys/unix/ext/raw.rs +++ b/library/std/src/sys/unix/ext/raw.rs @@ -1,4 +1,4 @@ -//! Unix-specific primitives available on all unix platforms +//! Unix-specific primitives available on all unix platforms. #![stable(feature = "raw_ext", since = "1.1.0")] #![rustc_deprecated( diff --git a/library/std/src/sys/windows/ext/io.rs b/library/std/src/sys/windows/ext/io.rs index 4573ee58932..e75f9a4bfd5 100644 --- a/library/std/src/sys/windows/ext/io.rs +++ b/library/std/src/sys/windows/ext/io.rs @@ -1,3 +1,5 @@ +//! Windows-specific extensions to general I/O primitives. + #![stable(feature = "rust1", since = "1.0.0")] use crate::fs; diff --git a/library/std/src/sys/windows/ext/raw.rs b/library/std/src/sys/windows/ext/raw.rs index 7f2a2877828..5014e008eb5 100644 --- a/library/std/src/sys/windows/ext/raw.rs +++ b/library/std/src/sys/windows/ext/raw.rs @@ -1,4 +1,4 @@ -//! Windows-specific primitives +//! Windows-specific primitives. #![stable(feature = "raw_ext", since = "1.1.0")] |
