about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-29 18:12:57 +0000
committerbors <bors@rust-lang.org>2018-12-29 18:12:57 +0000
commit007115746c6d0234742719dd67efba054abe97ce (patch)
tree2747628993f65d132462cee937827bc9054d8580 /src/libcore
parentd969c61e8c8be5b54fd96b7c3bc40cb9b3ace3c2 (diff)
parent68f370ce05405b73b7240d9eb25f23a4209687e2 (diff)
downloadrust-007115746c6d0234742719dd67efba054abe97ce.tar.gz
rust-007115746c6d0234742719dd67efba054abe97ce.zip
Auto merge of #57197 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests

Successful merges:

 - #57149 (Fix typo in pin documentation)
 - #57153 (Small: Fix span in char documentation)
 - #57159 (Update references to closed issue)
 - #57163 (Give the crate select chevron room to breathe.)
 - #57168 (Removed aligned ZST requirement from docs of read_/write_unaligned.)
 - #57174 (Update link to rustc guide)
 - #57177 (Fix warning when compiling rustc)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/pin.rs2
-rw-r--r--src/libcore/ptr.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/pin.rs b/src/libcore/pin.rs
index d8508631bf9..e31ac691e3a 100644
--- a/src/libcore/pin.rs
+++ b/src/libcore/pin.rs
@@ -25,7 +25,7 @@
 //! values.
 //!
 //! However, these restrictions are usually not necessary. Many types are always freely
-//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the affect
+//! movable. These types implement the [`Unpin`] auto-trait, which nullifies the effect
 //! of [`Pin`]. For `T: Unpin`, `Pin<Box<T>>` and `Box<T>` function identically, as do
 //! `Pin<&mut T>` and `&mut T`.
 //!
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index b9420f32a94..55a72d7a9a9 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -591,7 +591,7 @@ pub unsafe fn read<T>(src: *const T) -> T {
 /// whether `T` is [`Copy`].  If `T` is not [`Copy`], using both the returned
 /// value and the value at `*src` can [violate memory safety][read-ownership].
 ///
-/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
+/// Note that even if `T` has size `0`, the pointer must be non-NULL.
 ///
 /// [`Copy`]: ../marker/trait.Copy.html
 /// [`read`]: ./fn.read.html
@@ -759,7 +759,7 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
 ///
 /// * `dst` must be [valid] for writes.
 ///
-/// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
+/// Note that even if `T` has size `0`, the pointer must be non-NULL.
 ///
 /// [valid]: ../ptr/index.html#safety
 ///