about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-09-28 05:37:54 +0200
committerGitHub <noreply@github.com>2019-09-28 05:37:54 +0200
commit494a8a8525d957bb627293ef42713eb336210b4c (patch)
tree64732c5f36b6ae4034229466351cffdc3d453c90 /src/liballoc
parentfc53088a5cc72e7276dfc4acfef3c405c36c783a (diff)
parentc482c84142e4f4194a50c1fda4dbd311759bae41 (diff)
downloadrust-494a8a8525d957bb627293ef42713eb336210b4c.tar.gz
rust-494a8a8525d957bb627293ef42713eb336210b4c.zip
Rollup merge of #64836 - lzutao:stabilize-map_get_key_value, r=SimonSapin
Stabilize map_get_key_value feature

FCP done in https://github.com/rust-lang/rust/issues/49347#issuecomment-521728031
r? @SimonSapin
Closes #49347
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/collections/btree/map.rs3
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