diff options
| author | bors <bors@rust-lang.org> | 2019-09-28 03:38:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-28 03:38:48 +0000 |
| commit | f3c8eba643a815d720e7f20699b3dca144c845c4 (patch) | |
| tree | ab96a1cde1bbd285fa578cdd476bc4e30fec5fad /src/liballoc | |
| parent | c6f87c2c6e3b34381e5c37567a2b11af1fdf1507 (diff) | |
| parent | 017944c5a7236bcc3ed553d49dd1f43e73733966 (diff) | |
| download | rust-f3c8eba643a815d720e7f20699b3dca144c845c4.tar.gz rust-f3c8eba643a815d720e7f20699b3dca144c845c4.zip | |
Auto merge of #64864 - Centril:rollup-pxz6tw3, r=Centril
Rollup of 14 pull requests Successful merges: - #64703 (Docs: slice elements are equidistant) - #64745 (Include message on tests that should panic but do not) - #64781 (Remove stray references to the old global tcx) - #64794 (Remove unused DepTrackingMap) - #64802 (Account for tail expressions when pointing at return type) - #64809 (hir: Disallow `target_feature` on constants) - #64815 (Fix div_duration() marked as stable by mistake) - #64818 (update rtpSpawn's parameters type(It's prototype has been updated in libc)) - #64830 (Thou shallt not `.abort_if_errors()`) - #64836 (Stabilize map_get_key_value feature) - #64845 (pin.rs: fix links to primitives in documentation) - #64847 (Upgrade env_logger to 0.7) - #64851 (Add mailmap entry for Dustin Bensing by request) - #64859 (check_match: improve diagnostics for `let A = 2;` with `const A: i32 = 3`) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/map.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index 1683b810556..ddf012d1502 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -580,7 +580,6 @@ impl<K: Ord, V> BTreeMap<K, V> { /// # Examples /// /// ``` - /// #![feature(map_get_key_value)] /// use std::collections::BTreeMap; /// /// let mut map = BTreeMap::new(); @@ -588,7 +587,7 @@ impl<K: Ord, V> BTreeMap<K, V> { /// assert_eq!(map.get_key_value(&1), Some((&1, &"a"))); /// assert_eq!(map.get_key_value(&2), None); /// ``` - #[unstable(feature = "map_get_key_value", issue = "49347")] + #[stable(feature = "map_get_key_value", since = "1.40.0")] pub fn get_key_value<Q: ?Sized>(&self, k: &Q) -> Option<(&K, &V)> where K: Borrow<Q>, Q: Ord |