Add option.map_move and result.map_move#8294
Closed
erickt wants to merge 4 commits into
Closed
Conversation
Contributor
Author
|
Feel free to wait until #8288 builds before reviewing, as this PR will probably have a merge conflict with that PR. |
Contributor
|
Looks good. |
Contributor
Author
|
@bblum: updated to be rebased onto HEAD! Can you re-review? |
bors
added a commit
that referenced
this pull request
Aug 7, 2013
According to #7887, we've decided to use the syntax of `fn map<U>(f: &fn(&T) -> U) -> U`, which passes a reference to the closure, and to `fn map_move<U>(f: &fn(T) -> U) -> U` which moves the value into the closure. This PR adds these `.map_move()` functions to `Option` and `Result`. In addition, it has these other minor features: * Replaces a couple uses of `option.get()`, `result.get()`, and `result.get_err()` with `option.unwrap()`, `result.unwrap()`, and `result.unwrap_err()`. (See #8268 and #8288 for a more thorough adaptation of this functionality. * Removes `option.take_map()` and `option.take_map_default()`. These two functions can be easily written as `.take().map_move(...)`. * Adds a better error message to `result.unwrap()` and `result.unwrap_err()`.
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
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.
According to #7887, we've decided to use the syntax of
fn map<U>(f: &fn(&T) -> U) -> U, which passes a reference to the closure, and tofn map_move<U>(f: &fn(T) -> U) -> Uwhich moves the value into the closure. This PR adds these.map_move()functions toOptionandResult.In addition, it has these other minor features:
option.get(),result.get(), andresult.get_err()withoption.unwrap(),result.unwrap(), andresult.unwrap_err(). (See Updated std::Option, std::Either and std::Result #8268 and Alternative Updated std::Option, std::Either and std::Result #8288 for a more thorough adaptation of this functionality.option.take_map()andoption.take_map_default(). These two functions can be easily written as.take().map_move(...).result.unwrap()andresult.unwrap_err().