Merge pull request #1283 from kaiserd/master

marioidival · web-flow · commit dcee312c6626 · 2019-10-31T11:26:53.000-03:00
refactor: simplify extracting Result from Option
diff --git a/src/error/multiple_error_types/option_result.md b/src/error/multiple_error_types/option_result.md
@@ -39,9 +39,7 @@ fn double_first(vec: Vec<&str>) -> Result<Option<i32>, ParseIntError> {
         first.parse::<i32>().map(|n| 2 * n)
     });
 
-    let opt = opt.map_or(Ok(None), |r| r.map(Some))?;
-
-    Ok(opt)
+    opt.map_or(Ok(None), |r| r.map(Some))
 }
 
 fn main() {

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,7 @@ fn double_first(vec: Vec<&str>) -> Result<Option<i32>, ParseIntError> {`
`39`	`39`	`first.parse::<i32>().map(\|n\| 2 * n)`
`40`	`40`	`});`
`41`	`41`
`42`		`- let opt = opt.map_or(Ok(None), \|r\| r.map(Some))?;`
`43`		`-`
`44`		`- Ok(opt)`
	`42`	`+ opt.map_or(Ok(None), \|r\| r.map(Some))`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`fn main() {`