about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-17 18:38:34 +0000
committerbors <bors@rust-lang.org>2018-01-17 18:38:34 +0000
commit0f9c784751434c70ddd6719ccda6817c819126f9 (patch)
tree7c0645a6d63a20eeb7c2c3f2a0f81405f30b7b92 /src/liballoc
parent3e49ada7528bf664b2ccc8516a9ef7d21849a70b (diff)
parent5fade39c8811c04efd4e4b3783f8587a1cca9700 (diff)
downloadrust-0f9c784751434c70ddd6719ccda6817c819126f9.tar.gz
rust-0f9c784751434c70ddd6719ccda6817c819126f9.zip
Auto merge of #47522 - kennytm:rollup, r=kennytm
Rollup of 21 pull requests

- Successful merges: #47302, #47333, #47387, #47404, #47407, #47426, #47427, #47436, #47444, #47456, #47458, #47467, #47479, #47481, #47483, #47487, #47497, #47498, #47505, #47509, #47514
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index d8ce28695ab..6ee4f802802 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -15,7 +15,7 @@
 //!
 //! This library, like libcore, is not intended for general usage, but rather as
 //! a building block of other libraries. The types and interfaces in this
-//! library are reexported through the [standard library](../std/index.html),
+//! library are re-exported through the [standard library](../std/index.html),
 //! and should not be used through this library.
 //!
 //! ## Boxed values
@@ -52,7 +52,7 @@
 //! ## Collections
 //!
 //! Implementations of the most common general purpose data structures are
-//! defined in this library. They are reexported through the
+//! defined in this library. They are re-exported through the
 //! [standard collections library](../std/collections/index.html).
 //!
 //! ## Heap interfaces