diff options
| author | bors <bors@rust-lang.org> | 2017-08-23 13:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-23 13:46:14 +0000 |
| commit | 2bb8fca18215298487a8684a132da828fdb5a751 (patch) | |
| tree | 85c998b7c0ca6f5f97226790c95650e843566882 /src/libstd/primitive_docs.rs | |
| parent | a3f0ee9a7b17d522bfc6385f841d040445730f28 (diff) | |
| parent | 96efcdf0657004e48a279a469c42fe3097b2e8be (diff) | |
| download | rust-2bb8fca18215298487a8684a132da828fdb5a751.tar.gz rust-2bb8fca18215298487a8684a132da828fdb5a751.zip | |
Auto merge of #44058 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #43631, #43977, #43983, #44016, #44039, #44043, #44047, #44054 - Failed merges:
Diffstat (limited to 'src/libstd/primitive_docs.rs')
| -rw-r--r-- | src/libstd/primitive_docs.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 6746754ebc3..76ef36cc9a7 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -188,9 +188,10 @@ mod prim_unit { } /// Working with raw pointers in Rust is uncommon, /// typically limited to a few patterns. /// -/// Use the [`null`] function to create null pointers, and the [`is_null`] method -/// of the `*const T` type to check for null. The `*const T` type also defines -/// the [`offset`] method, for pointer math. +/// Use the [`null`] and [`null_mut`] functions to create null pointers, and the +/// [`is_null`] method of the `*const T` and `*mut T` types to check for null. +/// The `*const T` and `*mut T` types also define the [`offset`] method, for +/// pointer math. /// /// # Common ways to create raw pointers /// @@ -261,6 +262,7 @@ mod prim_unit { } /// *[See also the `std::ptr` module](ptr/index.html).* /// /// [`null`]: ../std/ptr/fn.null.html +/// [`null_mut`]: ../std/ptr/fn.null_mut.html /// [`is_null`]: ../std/primitive.pointer.html#method.is_null /// [`offset`]: ../std/primitive.pointer.html#method.offset /// [`into_raw`]: ../std/boxed/struct.Box.html#method.into_raw |
