Minor: remove some uses of unwrap #6738
Merged
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.
Which issue does this PR close?
Minor follow on to #6723
Rationale for this change
While reviewing #6723 (thanks @BryanEmond !) I noticed it would be possible to do so with a little less code using
Option::map
so I coded it upWhat changes are included in this PR?
Refactor some code to avoid
unwrap
Are these changes tested?
Covered by existing tests added in #6723
Are there any user-facing changes?