about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-08-14 15:27:15 -0700
committerGitHub <noreply@github.com>2016-08-14 15:27:15 -0700
commit13ff307f07327843348c0fb7476c4de77f95f89f (patch)
tree714f14faa5bb09f1e0c072e1cbfa15740ee7cbf5 /src/liballoc
parent1d5b758bab979b1db723bcc97ecd8398127bd8bc (diff)
parentbcee2edc54d04a2fcf5ba9e4a4a095bcf9be2bfc (diff)
downloadrust-13ff307f07327843348c0fb7476c4de77f95f89f.tar.gz
rust-13ff307f07327843348c0fb7476c4de77f95f89f.zip
Auto merge of #35666 - eddyb:rollup, r=eddyb
Rollup of 30 pull requests

- Successful merges: #34941, #35392, #35444, #35447, #35491, #35533, #35539, #35558, #35573, #35574, #35577, #35586, #35588, #35594, #35596, #35597, #35598, #35606, #35611, #35615, #35616, #35620, #35622, #35640, #35643, #35644, #35646, #35647, #35648, #35661
- Failed merges: #35395, #35415
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/raw_vec.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs
index 58c841151c0..cdb70ce5770 100644
--- a/src/liballoc/raw_vec.rs
+++ b/src/liballoc/raw_vec.rs
@@ -17,7 +17,7 @@ use super::boxed::Box;
 use core::ops::Drop;
 use core::cmp;
 
-/// A low-level utility for more ergonomically allocating, reallocating, and deallocating a
+/// A low-level utility for more ergonomically allocating, reallocating, and deallocating
 /// a buffer of memory on the heap without having to worry about all the corner cases
 /// involved. This type is excellent for building your own data structures like Vec and VecDeque.
 /// In particular:
@@ -534,8 +534,8 @@ impl<T> RawVec<T> {
     /// Converts the entire buffer into `Box<[T]>`.
     ///
     /// While it is not *strictly* Undefined Behavior to call
-    /// this procedure while some of the RawVec is unintialized,
-    /// it cetainly makes it trivial to trigger it.
+    /// this procedure while some of the RawVec is uninitialized,
+    /// it certainly makes it trivial to trigger it.
     ///
     /// Note that this will correctly reconstitute any `cap` changes
     /// that may have been performed. (see description of type for details)