user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reword

Browse source
This commit is contained in:
sinkuu 2017-10-13 09:56:50 +09:00
parent fa14f797f3
commit f577847aa2
2 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/librustc/traits/error_reporting.rs
View file

@ -852,40 +852,45 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
if n == 1 { "" } else { "s" },
);
let expected_str = if let Some(n) = expected_tuple {
assert!(expected == 1);
if closure_args.as_ref().map(|&(ref pats, _)| pats.len()) == Some(n) {
Cow::from("a single tuple as argument")
} else {
// be verbose when numbers differ
Cow::from(format!("a single {}-tuple as argument", n))
}
} else {
Cow::from(args_str(expected, false))
};
let found_str = if expected_tuple.is_some() {
args_str(found, true)
} else {
args_str(found, false)
};
let mut err = struct_span_err!(self.tcx.sess, span, E0593,
"{} is expected to take {}, but it takes {}",
kind,
if expected_tuple.is_some() {
Cow::from("a single tuple as argument")
} else {
Cow::from(args_str(expected, false))
},
if expected_tuple.is_some() {
args_str(found, true)
} else {
args_str(found, false)
},
expected_str,
found_str,
);
err.span_label(
span,
format!(
"expected {} that takes {}{}",
"expected {} that takes {}",
kind,
args_str(expected, false),
if let Some(n) = expected_tuple {
assert!(expected == 1);
Cow::from(format!(", a {}-tuple", n))
} else {
Cow::from("")
}
expected_str,
)
);
if let Some(span) = found_span {
if let (Some(expected_tuple), Some((pats, tys))) = (expected_tuple, closure_args) {
if expected_tuple != found || pats.len() != found {
err.span_label(span, format!("takes {}", args_str(found, true)));
err.span_label(span, format!("takes {}", found_str));
} else {
let sugg = format!(
"|({}){}|",
@ -906,10 +911,14 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
},
);
err.span_suggestion(span, "consider changing to", sugg);
err.span_suggestion(
span,
"consider changing the closure to accept a tuple",
sugg
);
}
} else {
err.span_label(span, format!("takes {}", args_str(found, false)));
err.span_label(span, format!("takes {}", found_str));
}
}

12
src/test/ui/mismatched_types/closure-arg-count.stderr
View file

@ -45,25 +45,25 @@ error[E0593]: closure is expected to take a single tuple as argument, but it tak
--> $DIR/closure-arg-count.rs:20:53
|
20 | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i, x| i);
| ^^^ ------ help: consider changing to: `|(i, x)|`
| ^^^ ------ help: consider changing the closure to accept a tuple: `|(i, x)|`
| |
| expected closure that takes 1 argument, a 2-tuple
| expected closure that takes a single tuple as argument
error[E0593]: closure is expected to take a single tuple as argument, but it takes 2 distinct arguments
--> $DIR/closure-arg-count.rs:21:53
|
21 | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i: usize, x| i);
| ^^^ ------------- help: consider changing to: `|(i, x): (usize, _)|`
| ^^^ ------------- help: consider changing the closure to accept a tuple: `|(i, x): (usize, _)|`
| |
| expected closure that takes 1 argument, a 2-tuple
| expected closure that takes a single tuple as argument
error[E0593]: closure is expected to take a single tuple as argument, but it takes 3 distinct arguments
error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 3 distinct arguments
--> $DIR/closure-arg-count.rs:22:53
|
22 | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i, x, y| i);
| ^^^ --------- takes 3 distinct arguments
| |
| expected closure that takes 1 argument, a 2-tuple
| expected closure that takes a single 2-tuple as argument
error: aborting due to 8 previous errors