Add retain to Map #822
Merged
Add retain to Map #822
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
November 11, 2021 20:24
This adds the `retain` function to the Map type which calls the inner maps, Either indexmap or std BTreeMap's, retain. I'm trying to mutate a Value::Object's Map in-place and could't find a nice way without the retain function.
dtolnay
requested changes
Nov 13, 2021
src/map.rs
Outdated
Comment on lines
237
to
261
| #[cfg(all(feature = "preserve_order", not(no_btreemap_retain)))] | ||
| /// Retains only the elements specified by the predicate. | ||
| /// | ||
| /// In other words, remove all pairs `(k, v)` such that `f(&k, &mut v)` returns `false`. | ||
| /// The elements are visited in ascending key order. | ||
| #[inline] | ||
| pub fn retain<F>(&mut self, f: F) | ||
| where | ||
| F: FnMut(&String, &mut Value) -> bool, | ||
| { | ||
| self.map.retain(f); | ||
| } | ||
|
|
||
| #[cfg(all(not(feature = "preserve_order"), not(no_btreemap_retain)))] | ||
| /// Retains only the elements specified by the predicate. | ||
| /// | ||
| /// In other words, remove all pairs `(k, v)` such that `f(&k, &mut v)` returns `false`. | ||
| /// The elements are visited in ascending key order. | ||
| #[inline] | ||
| pub fn retain<F>(&mut self, f: F) | ||
| where | ||
| F: FnMut(&String, &mut Value) -> bool, | ||
| { | ||
| self.map.retain(f); | ||
| } |
There was a problem hiding this comment.
Why are there two identical copies of this function? (Maybe I'm not observant enough to notice the difference — what is the difference between these?)
There was a problem hiding this comment.
Thanks for catching my mistake @dtolnay
They were originally different but eventually became the same. Combination of late night coding and distraction of kids. It should be good to go now.
Co-authored-by: David Tolnay <dtolnay@gmail.com>
|
Published in 1.0.70. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the
retainfunction to the Map type which calls the innermaps, Either
indexmapor stdBTreeMap's, retain.I'm trying to mutate a
Value::Object's Map in-place and could't find anice way without the
retainfunction.These new
retainfunctions will also only be included when compiling with Rust 1.53.0+ whenretainwas added to the BTreeMap in the std lib https://blog.rust-lang.org/2021/06/17/Rust-1.53.0.html#stabilized-apis