about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-17 22:24:11 +0000
committerbors <bors@rust-lang.org>2019-04-17 22:24:11 +0000
commit9387927ae2c0d2a283f6c48b705f25d38bb6e692 (patch)
tree64cc8bae3fa87a8a581b6d73e3bbee7802167d4d /src/libstd
parent3c3d3c1777041200bb7ed7a65b6562d62899778c (diff)
parent42b3cf107d8352d48de35f7caa76946a1b64e962 (diff)
downloadrust-9387927ae2c0d2a283f6c48b705f25d38bb6e692.tar.gz
rust-9387927ae2c0d2a283f6c48b705f25d38bb6e692.zip
Auto merge of #60054 - Centril:rollup-o40xxaa, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #59908 (Re-export core::str::{EscapeDebug, EscapeDefault, EscapeUnicode} in std)
 - #59984 (Remove collection-specific `with_capacity` documentation from `std::collections`)
 - #60036 (Remove nrc from toolstate pings)
 - #60037 (Resolve inconsistency in error messages between "parameter" and "variable".)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/mod.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/collections/mod.rs b/src/libstd/collections/mod.rs
index 286ce2d389b..15c2532f8b4 100644
--- a/src/libstd/collections/mod.rs
+++ b/src/libstd/collections/mod.rs
@@ -150,10 +150,9 @@
 //! Any `with_capacity` constructor will instruct the collection to allocate
 //! enough space for the specified number of elements. Ideally this will be for
 //! exactly that many elements, but some implementation details may prevent
-//! this. [`Vec`] and [`VecDeque`] can be relied on to allocate exactly the
-//! requested amount, though. Use `with_capacity` when you know exactly how many
-//! elements will be inserted, or at least have a reasonable upper-bound on that
-//! number.
+//! this. See collection-specific documentation for details. In general, use
+//! `with_capacity` when you know exactly how many elements will be inserted, or
+//! at least have a reasonable upper-bound on that number.
 //!
 //! When anticipating a large influx of elements, the `reserve` family of
 //! methods can be used to hint to the collection how much room it should make