diff options
| author | Florian Zeitz <florob@babelmonkeys.de> | 2016-08-30 05:44:21 +0200 |
|---|---|---|
| committer | Florian Zeitz <florob@babelmonkeys.de> | 2016-09-05 03:35:29 +0200 |
| commit | 1d344cfd9f37e7864f6d50d4fa0a919326d4229d (patch) | |
| tree | 5b58fb6caf045f57216810c8c55e74a1e2ef8568 | |
| parent | 77d2cd28fd715d2b9751de82b14d28ce6e376728 (diff) | |
| download | rust-1d344cfd9f37e7864f6d50d4fa0a919326d4229d.tar.gz rust-1d344cfd9f37e7864f6d50d4fa0a919326d4229d.zip | |
typeck: Fix error reporting of wrong entry function signatures
Expected and actual type were switched, this was introduced by refactoring in 8eb12d91aaf95432ca73bda429af04e0710c984d.
| -rw-r--r-- | src/librustc_typeck/lib.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 2a989105c9c..6318574b142 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -192,12 +192,12 @@ fn require_c_abi_if_variadic(tcx: TyCtxt, fn require_same_types<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>, origin: TypeOrigin, - t1: Ty<'tcx>, - t2: Ty<'tcx>) + expected: Ty<'tcx>, + actual: Ty<'tcx>) -> bool { ccx.tcx.infer_ctxt(None, None, Reveal::NotSpecializable).enter(|infcx| { - if let Err(err) = infcx.eq_types(false, origin.clone(), t1, t2) { - infcx.report_mismatched_types(origin, t1, t2, err); + if let Err(err) = infcx.eq_types(false, origin.clone(), expected, actual) { + infcx.report_mismatched_types(origin, expected, actual, err); false } else { true @@ -246,8 +246,8 @@ fn check_main_fn_ty(ccx: &CrateCtxt, require_same_types( ccx, TypeOrigin::MainFunctionType(main_span), - main_t, - se_ty); + se_ty, + main_t); } _ => { span_bug!(main_span, @@ -302,8 +302,8 @@ fn check_start_fn_ty(ccx: &CrateCtxt, require_same_types( ccx, TypeOrigin::StartFunctionType(start_span), - start_t, - se_ty); + se_ty, + start_t); } _ => { span_bug!(start_span, |