about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-10 17:10:13 +0000
committerbors <bors@rust-lang.org>2017-05-10 17:10:13 +0000
commit978d2cfee1ee9da704c960c8047e978a7003b582 (patch)
treee74ba8f6a9d7b0b7bfa6a313ed7e1828219be6f3 /src/libcore
parent25a161765fb90f2bfc78bda8fef944048e72bd26 (diff)
parent19f1146ded4f7cfd4dc2720dcee49d9464a92429 (diff)
downloadrust-978d2cfee1ee9da704c960c8047e978a7003b582.tar.gz
rust-978d2cfee1ee9da704c960c8047e978a7003b582.zip
Auto merge of #41887 - steveklabnik:rollup, r=steveklabnik
Rollup of 5 pull requests

- Successful merges: #41531, #41536, #41809, #41854, #41886
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/ptr.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index a60abefc076..5f189d473be 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -1005,7 +1005,7 @@ unsafe impl<T: Sync + ?Sized> Sync for Unique<T> { }
 
 #[unstable(feature = "unique", issue = "27730")]
 impl<T: Sized> Unique<T> {
-    /// Creates a new `Shared` that is dangling, but well-aligned.
+    /// Creates a new `Unique` that is dangling, but well-aligned.
     ///
     /// This is useful for initializing types which lazily allocate, like
     /// `Vec::new` does.