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

typeck: Fix error reporting of wrong entry function signatures

Browse source 
Expected and actual type were switched, this was introduced by
refactoring in 8eb12d91aa.
This commit is contained in:
Florian Zeitz 2016-08-30 05:44:21 +02:00
parent 77d2cd28fd
commit 1d344cfd9f
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc_typeck/lib.rs
View file

@ -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,