OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error message label

Browse Source
This commit is contained in:
alexey zabelin 2017-04-28 18:01:06 -04:00
parent 5312f0c329
commit c741bc8032
No known key found for this signature in database
GPG Key ID: 3A169985478324E9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_typeck/check/coercion.rs
View File

@ -1104,7 +1104,7 @@ impl<'gcx, 'tcx, 'exprs, E> CoerceMany<'gcx, 'tcx, 'exprs, E>
// Another example is `break` with no argument expression. // Another example is `break` with no argument expression.
assert!(expression_ty.is_nil()); assert!(expression_ty.is_nil());
assert!(expression_ty.is_nil(), "if let hack without unit type"); assert!(expression_ty.is_nil(), "if let hack without unit type");
fcx.eq_types(true, cause, expression_ty, self.merged_ty()) fcx.eq_types(label_expression_as_expected, cause, expression_ty, self.merged_ty())
.map(|infer_ok| { .map(|infer_ok| {
fcx.register_infer_ok_obligations(infer_ok); fcx.register_infer_ok_obligations(infer_ok);
expression_ty expression_ty
@ -1128,6 +1128,10 @@ impl<'gcx, 'tcx, 'exprs, E> CoerceMany<'gcx, 'tcx, 'exprs, E>
} }
Err(err) => { Err(err) => {
let (expected, found) = if label_expression_as_expected { let (expected, found) = if label_expression_as_expected {
// In the case where this is a "forced unit", like
// `break`, we want to call the `()` "expected"
// since it is implied by the syntax.
// (Note: not all force-units work this way.)"
(expression_ty, self.final_ty.unwrap_or(self.expected_ty)) (expression_ty, self.final_ty.unwrap_or(self.expected_ty))
} else { } else {
// Otherwise, the "expected" type for error // Otherwise, the "expected" type for error

2
src/test/ui/coercion-missing-tail-expected-type.stderr
View File

@ -5,7 +5,7 @@ error[E0308]: mismatched types
| ____________________________^ | ____________________________^
14 | | x + 1; 14 | | x + 1;
15 | | } 15 | | }
| |_^ expected (), found i32 | |_^ expected i32, found ()
| |
= note: expected type `i32` = note: expected type `i32`
found type `()` found type `()`