Use more functional programming in ArenaMap::insert #3778
Merged
Conversation
This file contains hidden or 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
I find this more readable and it flattens out the body a little.
lnicola
reviewed
Mar 30, 2020
Member
lnicola
left a comment
lnicola
left a comment
There was a problem hiding this comment.
I wonder if we need the reserve call above.
Contributor
Author
|
I was wondering that myself. I'm not sure if |
Member
|
I think it can thanks to the size hint, but I'm not sure. |
Contributor
Author
|
Ok I think it is. |
`Take` implements `TrustedLen` so we are guaranteed that only one reserve call will be made.
Contributor
Author
|
I'm not sure what that failing macos test is about. |
Member
|
I think it's a race, it happened in another PR or two today. |
matklad
reviewed
Mar 31, 2020
crates/ra_arena/src/map.rs
Outdated
| } | ||
|
|
||
| let fill = (idx + 1).saturating_sub(self.v.len()); | ||
| self.v.extend(std::iter::repeat_with(|| None).take(fill)); |
Contributor
There was a problem hiding this comment.
Suggested change
| self.v.extend(std::iter::repeat_with(|| None).take(fill)); | |
| self.v.resize(idx + 1, None); |
Contributor
There was a problem hiding this comment.
Sorry for the imperative rain on your functional parade :)
Contributor
There was a problem hiding this comment.
ah, wait, it indeed can truncate, I guess that needs to be (idx + 1).max(self.v.len())
Contributor
|
bors r+ |
Contributor
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I find this more readable and it flattens out the body a little. Others may disagree.