rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add tracking issue for map_try_insert.

Browse Source
This commit is contained in:
Mara Bos
2021-03-04 16:54:28 +01:00
parent 1aedb4c3a3
commit eddd4f0501
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/alloc/src/collections/btree/map.rs
View File

@@ -859,7 +859,7 @@ impl<K, V> BTreeMap<K, V> {
/// assert_eq!(err.entry.get(), &"a"); /// assert_eq!(err.entry.get(), &"a");
/// assert_eq!(err.value, "b"); /// assert_eq!(err.value, "b");
/// ``` /// ```
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
pub fn try_insert(&mut self, key: K, value: V) -> Result<&mut V, OccupiedError<'_, K, V>> pub fn try_insert(&mut self, key: K, value: V) -> Result<&mut V, OccupiedError<'_, K, V>>
where where
K: Ord, K: Ord,

6
library/alloc/src/collections/btree/map/entry.rs
View File

@@ -74,7 +74,7 @@ impl<K: Debug + Ord, V: Debug> Debug for OccupiedEntry<'_, K, V> {
/// The error returned by [`try_insert`](BTreeMap::try_insert) when the key already exists. /// The error returned by [`try_insert`](BTreeMap::try_insert) when the key already exists.
/// ///
/// Contains the occupied entry, and the value that was not inserted. /// Contains the occupied entry, and the value that was not inserted.
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
pub struct OccupiedError<'a, K: 'a, V: 'a> { pub struct OccupiedError<'a, K: 'a, V: 'a> {
/// The entry in the map that was already occupied. /// The entry in the map that was already occupied.
pub entry: OccupiedEntry<'a, K, V>, pub entry: OccupiedEntry<'a, K, V>,
@@ -82,7 +82,7 @@ pub struct OccupiedError<'a, K: 'a, V: 'a> {
pub value: V, pub value: V,
} }
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
impl<K: Debug + Ord, V: Debug> Debug for OccupiedError<'_, K, V> { impl<K: Debug + Ord, V: Debug> Debug for OccupiedError<'_, K, V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("OccupiedError") f.debug_struct("OccupiedError")
@@ -93,7 +93,7 @@ impl<K: Debug + Ord, V: Debug> Debug for OccupiedError<'_, K, V> {
} }
} }
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
impl<'a, K: Debug + Ord, V: Debug> fmt::Display for OccupiedError<'a, K, V> { impl<'a, K: Debug + Ord, V: Debug> fmt::Display for OccupiedError<'a, K, V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!( write!(

8
library/std/src/collections/hash/map.rs
View File

@@ -867,7 +867,7 @@ where
/// assert_eq!(err.entry.get(), &"a"); /// assert_eq!(err.entry.get(), &"a");
/// assert_eq!(err.value, "b"); /// assert_eq!(err.value, "b");
/// ``` /// ```
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
pub fn try_insert(&mut self, key: K, value: V) -> Result<&mut V, OccupiedError<'_, K, V>> { pub fn try_insert(&mut self, key: K, value: V) -> Result<&mut V, OccupiedError<'_, K, V>> {
match self.entry(key) { match self.entry(key) {
Occupied(entry) => Err(OccupiedError { entry, value }), Occupied(entry) => Err(OccupiedError { entry, value }),
@@ -1887,7 +1887,7 @@ impl<K: Debug, V> Debug for VacantEntry<'_, K, V> {
/// The error returned by [`try_insert`](HashMap::try_insert) when the key already exists. /// The error returned by [`try_insert`](HashMap::try_insert) when the key already exists.
/// ///
/// Contains the occupied entry, and the value that was not inserted. /// Contains the occupied entry, and the value that was not inserted.
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
pub struct OccupiedError<'a, K: 'a, V: 'a> { pub struct OccupiedError<'a, K: 'a, V: 'a> {
/// The entry in the map that was already occupied. /// The entry in the map that was already occupied.
pub entry: OccupiedEntry<'a, K, V>, pub entry: OccupiedEntry<'a, K, V>,
@@ -1895,7 +1895,7 @@ pub struct OccupiedError<'a, K: 'a, V: 'a> {
pub value: V, pub value: V,
} }
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
impl<K: Debug, V: Debug> Debug for OccupiedError<'_, K, V> { impl<K: Debug, V: Debug> Debug for OccupiedError<'_, K, V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("OccupiedError") f.debug_struct("OccupiedError")
@@ -1906,7 +1906,7 @@ impl<K: Debug, V: Debug> Debug for OccupiedError<'_, K, V> {
} }
} }
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
impl<'a, K: Debug, V: Debug> fmt::Display for OccupiedError<'a, K, V> { impl<'a, K: Debug, V: Debug> fmt::Display for OccupiedError<'a, K, V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!( write!(

4
library/std/src/error.rs
View File

@@ -470,7 +470,7 @@ impl Error for char::DecodeUtf16Error {
} }
} }
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
impl<'a, K: Debug + Ord, V: Debug> Error impl<'a, K: Debug + Ord, V: Debug> Error
for crate::collections::btree_map::OccupiedError<'a, K, V> for crate::collections::btree_map::OccupiedError<'a, K, V>
{ {
@@ -480,7 +480,7 @@ impl<'a, K: Debug + Ord, V: Debug> Error
} }
} }
#[unstable(feature = "map_try_insert", issue = "none")] #[unstable(feature = "map_try_insert", issue = "82766")]
impl<'a, K: Debug, V: Debug> Error for crate::collections::hash_map::OccupiedError<'a, K, V> { impl<'a, K: Debug, V: Debug> Error for crate::collections::hash_map::OccupiedError<'a, K, V> {
#[allow(deprecated)] #[allow(deprecated)]
fn description(&self) -> &str { fn description(&self) -> &str {