about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-17 05:52:35 +0000
committerbors <bors@rust-lang.org>2015-04-17 05:52:35 +0000
commitb7fb57529aded92c4f470568e6b5ea7a5a28f6a4 (patch)
treea906315439fb7dcdab8d025229a0e5e2028af7da /src/libstd
parent7fbedc58e3b0e102ece926a7f99041fc3ad3037a (diff)
parenta4be1ec140e7c61b8f73834ab722f7b056ad21b9 (diff)
downloadrust-b7fb57529aded92c4f470568e6b5ea7a5a28f6a4.tar.gz
rust-b7fb57529aded92c4f470568e6b5ea7a5a28f6a4.zip
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/map.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index f554a4f4ed6..9b93066f9fb 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -1469,7 +1469,6 @@ impl<'a, K, V> ExactSizeIterator for Drain<'a, K, V> {
 }
 
 impl<'a, K, V> Entry<'a, K, V> {
-    /// Returns a mutable reference to the entry if occupied, or the VacantEntry if vacant.
     #[unstable(feature = "std_misc",
                reason = "will soon be replaced by or_insert")]
     #[deprecated(since = "1.0",