about summary refs log tree commit diff
path: root/src/librustc_data_structures
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-17 17:10:25 +0000
committerbors <bors@rust-lang.org>2017-08-17 17:10:25 +0000
commit59ccba995de202fb9d9a8d795d2770fb2d199db0 (patch)
treec3fb8fc436dc758eb7b2d7c6ddf438225671c3c0 /src/librustc_data_structures
parentdd39ecf368a3cdb937e129f36a2a342d0c9358f0 (diff)
parent235fb23e553db0af9ac6e7d134a9f5a35bdf6619 (diff)
downloadrust-59ccba995de202fb9d9a8d795d2770fb2d199db0.tar.gz
rust-59ccba995de202fb9d9a8d795d2770fb2d199db0.zip
Auto merge of #43939 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests

- Successful merges: #43891, #43905, #43912, #43914, #43915, #43916, #43920, #43928, #43930
- Failed merges:
Diffstat (limited to 'src/librustc_data_structures')
-rw-r--r--src/librustc_data_structures/accumulate_vec.rs2
-rw-r--r--src/librustc_data_structures/ivar.rs2
-rw-r--r--src/librustc_data_structures/small_vec.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_data_structures/accumulate_vec.rs b/src/librustc_data_structures/accumulate_vec.rs
index c03c2890ba3..52306de74cb 100644
--- a/src/librustc_data_structures/accumulate_vec.rs
+++ b/src/librustc_data_structures/accumulate_vec.rs
@@ -13,7 +13,7 @@
 //! Space for up to N elements is provided on the stack.  If more elements are collected, Vec is
 //! used to store the values on the heap.
 //!
-//! The N above is determined by Array's implementor, by way of an associatated constant.
+//! The N above is determined by Array's implementor, by way of an associated constant.
 
 use std::ops::{Deref, DerefMut};
 use std::iter::{self, IntoIterator, FromIterator};
diff --git a/src/librustc_data_structures/ivar.rs b/src/librustc_data_structures/ivar.rs
index f842f4a41a1..de44509ef2f 100644
--- a/src/librustc_data_structures/ivar.rs
+++ b/src/librustc_data_structures/ivar.rs
@@ -14,7 +14,7 @@ use std::cell::Cell;
 /// A write-once variable. When constructed, it is empty, and
 /// can only be set once.
 ///
-/// Ivars ensure that data that can only be initialised once. A full
+/// Ivars ensure that data that can only be initialized once. A full
 /// implementation is used for concurrency and blocks on a read of an
 /// unfulfilled value. This implementation is more minimal and panics
 /// if you attempt to read the value before it has been set. It is also
diff --git a/src/librustc_data_structures/small_vec.rs b/src/librustc_data_structures/small_vec.rs
index 4e2b3786021..74738e61b44 100644
--- a/src/librustc_data_structures/small_vec.rs
+++ b/src/librustc_data_structures/small_vec.rs
@@ -14,7 +14,7 @@
 //! used to store the values on the heap. SmallVec is similar to AccumulateVec, but adds
 //! the ability to push elements.
 //!
-//! The N above is determined by Array's implementor, by way of an associatated constant.
+//! The N above is determined by Array's implementor, by way of an associated constant.
 
 use std::ops::{Deref, DerefMut};
 use std::iter::{IntoIterator, FromIterator};