From 1b41019d508ba21ec009242b441f5e016a9728ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sat, 27 May 2017 23:19:54 +0200
Subject: [PATCH] Fixes #42143

Also adds test for this case.
---
 src/librustc/traits/error_reporting.rs        | 22 ++++++++++++++-----
 src/test/ui/mismatched_types/issue-42143.rs   | 14 ++++++++++++
 .../ui/mismatched_types/issue-42143.stderr    | 20 +++++++++++++++++
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 src/test/ui/mismatched_types/issue-42143.rs
 create mode 100644 src/test/ui/mismatched_types/issue-42143.stderr

diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index 049d5e488c946..48da20399c13c 100644
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -684,24 +684,36 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                                                    expected_found.found,
                                                    expected_trait_ty.is_closure())
                 } else if let &TypeError::Sorts(ref expected_found) = e {
-                    let expected = if let ty::TyTuple(tys, _) = expected_found.expected.sty {
+                    let expected_len = if let ty::TyTuple(tys, _) = expected_found.expected.sty {
                         tys.len()
+                    } else if let ty::TyRef(_,ty::TypeAndMut{ty,..}) = expected_found.expected.sty {
+                        if let ty::TyTuple(tys,_) = ty.sty {
+                            tys.len()
+                        } else {
+                            1
+                        }
                     } else {
                         1
                     };
-                    let found = if let ty::TyTuple(tys, _) = expected_found.found.sty {
+                    let found_len = if let ty::TyTuple(tys, _) = expected_found.found.sty {
                         tys.len()
+                    } else if let ty::TyRef(_,ty::TypeAndMut{ty,..}) = expected_found.found.sty {
+                        if let ty::TyTuple(tys,_) = ty.sty {
+                            tys.len()
+                        } else {
+                            1
+                        }
                     } else {
                         1
                     };
 
-                    if expected != found {
+                    if expected_len != found_len {
                         // Expected `|| { }`, found `|x, y| { }`
                         // Expected `fn(x) -> ()`, found `|| { }`
                         self.report_arg_count_mismatch(span,
                                                        found_span,
-                                                       expected,
-                                                       found,
+                                                       expected_len,
+                                                       found_len,
                                                        expected_trait_ty.is_closure())
                     } else {
                         self.report_type_argument_mismatch(span,
diff --git a/src/test/ui/mismatched_types/issue-42143.rs b/src/test/ui/mismatched_types/issue-42143.rs
new file mode 100644
index 0000000000000..b34dbee10685e
--- /dev/null
+++ b/src/test/ui/mismatched_types/issue-42143.rs
@@ -0,0 +1,14 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let a = vec![(1,2)];
+    let b = a.iter().map(|x: (u32, u32)| 0);
+}
diff --git a/src/test/ui/mismatched_types/issue-42143.stderr b/src/test/ui/mismatched_types/issue-42143.stderr
new file mode 100644
index 0000000000000..e313ed7e3f7ba
--- /dev/null
+++ b/src/test/ui/mismatched_types/issue-42143.stderr
@@ -0,0 +1,20 @@
+error[E0281]: type mismatch: `[closure@$DIR/issue-42143.rs:13:26: 13:43]` implements the trait `std::ops::FnMut<((u32, u32),)>`, but the trait `std::ops::FnMut<(&({integer}, {integer}),)>` is required
+  --> $DIR/issue-42143.rs:13:22
+   |
+13 |     let b = a.iter().map(|x: (u32, u32)| 0);
+   |                      ^^^ ----------------- implements `std::ops::FnMut<((u32, u32),)>`
+   |                      |
+   |                      requires `std::ops::FnMut<(&({integer}, {integer}),)>`
+   |                      expected reference, found tuple
+
+error[E0281]: type mismatch: `[closure@$DIR/issue-42143.rs:13:26: 13:43]` implements the trait `std::ops::FnOnce<((u32, u32),)>`, but the trait `std::ops::FnOnce<(&({integer}, {integer}),)>` is required
+  --> $DIR/issue-42143.rs:13:22
+   |
+13 |     let b = a.iter().map(|x: (u32, u32)| 0);
+   |                      ^^^ ----------------- implements `std::ops::FnOnce<((u32, u32),)>`
+   |                      |
+   |                      requires `std::ops::FnOnce<(&({integer}, {integer}),)>`
+   |                      expected reference, found tuple
+
+error: aborting due to previous error(s)
+