Fix match ergonomics suggestion

matthewjasper · matthewjasper · commit 5b5255da4e7a · 2019-05-13T22:45:11.000+01:00
diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs
@@ -540,7 +540,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                         err.help(&format!("did you mean `{}: &{}`?", snippet, expected));
                     }
                 }
-                hir::Node::Expr(hir::Expr { node: hir::ExprKind::Match(..), .. }) |
+                hir::Node::Arm(_) |
                 hir::Node::Pat(_) => {
                     // rely on match ergonomics or it might be nested `&&pat`
                     if let Ok(snippet) = tcx.sess.source_map().span_to_snippet(inner.span) {

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {`
`540`	`540`	err.help(&format!("did you mean `{}: &{}`?", snippet, expected));
`541`	`541`	`}`
`542`	`542`	`}`
`543`		`- hir::Node::Expr(hir::Expr { node: hir::ExprKind::Match(..), .. }) \|`
	`543`	`+ hir::Node::Arm(_) \|`
`544`	`544`	`hir::Node::Pat(_) => {`
`545`	`545`	// rely on match ergonomics or it might be nested `&&pat`
`546`	`546`	`if let Ok(snippet) = tcx.sess.source_map().span_to_snippet(inner.span) {`