about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-14 22:23:59 +0000
committerbors <bors@rust-lang.org>2016-01-14 22:23:59 +0000
commit2fb0c5ebcf6d912224532265776fb96febea9797 (patch)
tree60309b6ce82ca33f616667fd10c13910755f8319 /src/liballoc
parentc12c42de0ac3f4ab50f2c138e53e6e94f8da11ec (diff)
parent6ab39ff098fb7b3c04372380c059e144e5d88993 (diff)
downloadrust-2fb0c5ebcf6d912224532265776fb96febea9797.tar.gz
rust-2fb0c5ebcf6d912224532265776fb96febea9797.zip
Auto merge of #30916 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #30712, #30895, #30902, #30903, #30909, #30910, #30911, #30912, #30914
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/boxed.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index efc28be92a4..be140469eb6 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -222,12 +222,12 @@ impl<T: ?Sized> Drop for IntermediateBox<T> {
 }
 
 impl<T> Box<T> {
-    /// Allocates memory on the heap and then moves `x` into it.
+    /// Allocates memory on the heap and then places `x` into it.
     ///
     /// # Examples
     ///
     /// ```
-    /// let x = Box::new(5);
+    /// let five = Box::new(5);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline(always)]
@@ -266,7 +266,7 @@ impl<T: ?Sized> Box<T> {
     /// # Examples
     ///
     /// ```
-    /// let seventeen = Box::new(17u32);
+    /// let seventeen = Box::new(17);
     /// let raw = Box::into_raw(seventeen);
     /// let boxed_again = unsafe { Box::from_raw(raw) };
     /// ```