Pattern match on Ok instead of Some of .ok() retval

est31 · est31 · commit 4d328f786e6a · 2018-05-15T15:47:57.000+02:00
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -3723,7 +3723,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
               tcx.mk_nil()
           }
           hir::ExprBreak(destination, ref expr_opt) => {
-              if let Some(target_id) = destination.target_id.ok() {
+              if let Ok(target_id) = destination.target_id {
                   let (e_ty, cause);
                   if let Some(ref e) = *expr_opt {
                       // If this is a break with a value, we need to type-check

Original file line number	Diff line number	Diff line change
`@@ -3723,7 +3723,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {`
`3723`	`3723`	`tcx.mk_nil()`
`3724`	`3724`	`}`
`3725`	`3725`	`hir::ExprBreak(destination, ref expr_opt) => {`
`3726`		`- if let Some(target_id) = destination.target_id.ok() {`
	`3726`	`+ if let Ok(target_id) = destination.target_id {`
`3727`	`3727`	`let (e_ty, cause);`
`3728`	`3728`	`if let Some(ref e) = *expr_opt {`
`3729`	`3729`	`// If this is a break with a value, we need to type-check`