about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorJon Gjengset <jon@thesquareplanet.com>2019-09-28 09:25:47 -0400
committerJon Gjengset <jon@thesquareplanet.com>2019-09-28 09:25:47 -0400
commitc7f6df0d5a64010fc0b3612773f56245ee581247 (patch)
treee0551931779455fb745309d57709124c255c061c /src/liballoc
parent4d34ce2c2515a429bea325b93aea332ac8d6a7b9 (diff)
parentf3c8eba643a815d720e7f20699b3dca144c845c4 (diff)
downloadrust-c7f6df0d5a64010fc0b3612773f56245ee581247.tar.gz
rust-c7f6df0d5a64010fc0b3612773f56245ee581247.zip
Merge branch 'master' into format-temporaries
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