Skip to content

Fixed small logic error in error/option_unwrap/and_then #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2018
Merged

Fixed small logic error in error/option_unwrap/and_then #1127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/error/option_unwrap/and_then.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ fn have_recipe(food: Food) -> Option<Food> {
}
}

// To make a dish, we need both the ingredients and the recipe.
// To make a dish, we need both the recipe and the ingredients.
// We can represent the logic with a chain of `match`es:
fn cookable_v1(food: Food) -> Option<Food> {
match have_ingredients(food) {
match have_recipe(food) {
None => None,
Some(food) => match have_recipe(food) {
Some(food) => match have_ingredients(food) {
None => None,
Some(food) => Some(food),
},
Expand All @@ -48,7 +48,7 @@ fn cookable_v1(food: Food) -> Option<Food> {

// This can conveniently be rewritten more compactly with `and_then()`:
fn cookable_v2(food: Food) -> Option<Food> {
have_ingredients(food).and_then(have_recipe)
have_recipe(food).and_then(have_ingredients)
}

fn eat(food: Food, day: Day) {
Expand Down