diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-08-17 13:23:20 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-08-17 13:23:20 -0700 |
| commit | 4b5f330c706e115ce75667a650e7c15c429d3a20 (patch) | |
| tree | 80bedaa7a3cfc5a41827c96717ef73d25bb297f6 /src/librustc_data_structures | |
| parent | 63477fdeceead5683dfa197c5450ffe1bee3ab04 (diff) | |
| parent | 59ccba995de202fb9d9a8d795d2770fb2d199db0 (diff) | |
| download | rust-4b5f330c706e115ce75667a650e7c15c429d3a20.tar.gz rust-4b5f330c706e115ce75667a650e7c15c429d3a20.zip | |
Merge remote-tracking branch 'origin/master' into gen
Diffstat (limited to 'src/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/accumulate_vec.rs | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/ivar.rs | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/small_vec.rs | 2 |
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}; |
