about summary refs log tree commit diff
path: root/src/liballoc/raw_vec.rs
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/liballoc/raw_vec.rs
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/liballoc/raw_vec.rs')
-rw-r--r--src/liballoc/raw_vec.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs
index 9a8614895f3..841f9dc6414 100644
--- a/src/liballoc/raw_vec.rs
+++ b/src/liballoc/raw_vec.rs
@@ -544,12 +544,12 @@ impl<T, A: Alloc> RawVec<T, A> {
     /// Attempts to ensure that the buffer contains at least enough space to hold
     /// `used_cap + needed_extra_cap` elements. If it doesn't already have
     /// enough capacity, will reallocate in place enough space plus comfortable slack
-    /// space to get amortized `O(1)` behaviour. Will limit this behaviour
+    /// space to get amortized `O(1)` behavior. Will limit this behaviour
     /// if it would needlessly cause itself to panic.
     ///
     /// If `used_cap` exceeds `self.cap()`, this may fail to actually allocate
     /// the requested space. This is not really unsafe, but the unsafe
-    /// code *you* write that relies on the behaviour of this function may break.
+    /// code *you* write that relies on the behavior of this function may break.
     ///
     /// Returns true if the reallocation attempt has succeeded, or false otherwise.
     ///