diff options
| author | bors <bors@rust-lang.org> | 2018-02-25 15:04:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-25 15:04:40 +0000 |
| commit | 322d7f7b97f1672bade31e1c43d5753e0e45a1a8 (patch) | |
| tree | 9da99f11e21caf2cb8e83bfa84cff6a2f0c376ee /src/liballoc | |
| parent | 026339e42ba11a559767029d933d1197aefb877a (diff) | |
| parent | 1aa103511b6c52943e54f62992551babef9d4526 (diff) | |
| download | rust-322d7f7b97f1672bade31e1c43d5753e0e45a1a8.tar.gz rust-322d7f7b97f1672bade31e1c43d5753e0e45a1a8.zip | |
Auto merge of #48531 - kennytm:rollup, r=kennytm
Rollup of 17 pull requests - Successful merges: #47964, #47970, #48076, #48115, #48166, #48281, #48297, #48302, #48362, #48369, #48489, #48491, #48494, #48517, #48529, #48235, #48330 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/btree/map.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/btree/map.rs b/src/liballoc/btree/map.rs index b320bed5432..618ef81fdd9 100644 --- a/src/liballoc/btree/map.rs +++ b/src/liballoc/btree/map.rs @@ -2114,7 +2114,6 @@ impl<'a, K: Ord, V> Entry<'a, K, V> { /// # Examples /// /// ``` - /// #![feature(entry_and_modify)] /// use std::collections::BTreeMap; /// /// let mut map: BTreeMap<&str, usize> = BTreeMap::new(); @@ -2129,7 +2128,7 @@ impl<'a, K: Ord, V> Entry<'a, K, V> { /// .or_insert(42); /// assert_eq!(map["poneyland"], 43); /// ``` - #[unstable(feature = "entry_and_modify", issue = "44733")] + #[stable(feature = "entry_and_modify", since = "1.26.0")] pub fn and_modify<F>(self, mut f: F) -> Self where F: FnMut(&mut V) { |