Fix build after rebase to lastest master

src/librustc_typeck/check/_match.rs

@@ -610,7 +610,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
         let scheme = tcx.lookup_item_type(def.def_id());
         let scheme = if scheme.ty.is_fn() {
             // Replace constructor type with constructed type for tuple struct patterns.
-            let fn_ret = tcx.no_late_bound_regions(&scheme.ty.fn_ret()).unwrap().unwrap();
+            let fn_ret = tcx.no_late_bound_regions(&scheme.ty.fn_ret()).unwrap();
             ty::TypeScheme { ty: fn_ret, generics: scheme.generics }
         } else {
             // Leave the type as is for unit structs (backward compatibility).

src/librustc_typeck/check/mod.rs

@@ -4090,7 +4090,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                                   def: Def,
                                   span: Span,
                                   node_id: ast::NodeId,
-                                  node_is_expr: bool) {
+                                  node_is_expr: bool)
                                   -> Ty<'tcx> {
         debug!("instantiate_value_path(path={:?}, def={:?}, node_id={}, type_scheme={:?})",
                segments,