Only suggest 1-tuple if expected and found types match
This commit is contained in:
parent
18cea90d4a
commit
91a43f0423
2 changed files with 27 additions and 23 deletions
|
@ -2044,8 +2044,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
|
|||
// If a tuple of length one was expected and the found expression has
|
||||
// parentheses around it, perhaps the user meant to write `(expr,)` to
|
||||
// build a tuple (issue #86100)
|
||||
(ty::Tuple(_), _) if expected.tuple_fields().count() == 1 => {
|
||||
if let Ok(code) = self.tcx.sess().source_map().span_to_snippet(span) {
|
||||
(ty::Tuple(_), _) => {
|
||||
if let [expected_tup_elem] =
|
||||
expected.tuple_fields().collect::<Vec<_>>()[..]
|
||||
{
|
||||
if same_type_modulo_infer(expected_tup_elem, found) {
|
||||
if let Ok(code) =
|
||||
self.tcx.sess().source_map().span_to_snippet(span)
|
||||
{
|
||||
if code.starts_with('(') && code.ends_with(')') {
|
||||
let before_close = span.hi() - BytePos::from_u32(1);
|
||||
|
||||
|
@ -2067,6 +2073,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// If a character was expected and the found expression is a string literal
|
||||
// containing a single character, perhaps the user meant to write `'c'` to
|
||||
// specify a character literal (issue #92479)
|
||||
|
|
|
@ -12,10 +12,6 @@ LL | <F as FnOnce(&mut u8)>::call_once(f, 1)
|
|||
|
|
||||
= note: expected tuple `(&mut u8,)`
|
||||
found type `{integer}`
|
||||
help: use a trailing comma to create a tuple with one element
|
||||
|
|
||||
LL | <F as FnOnce(&mut u8)>::call_once(f, (1,))
|
||||
| + ++
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue