File tree 1 file changed +8
-8
lines changed
1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -192,12 +192,12 @@ fn require_c_abi_if_variadic(tcx: TyCtxt,
192
192
193
193
fn require_same_types < ' a , ' tcx > ( ccx : & CrateCtxt < ' a , ' tcx > ,
194
194
origin : TypeOrigin ,
195
- t1 : Ty < ' tcx > ,
196
- t2 : Ty < ' tcx > )
195
+ expected : Ty < ' tcx > ,
196
+ actual : Ty < ' tcx > )
197
197
-> bool {
198
198
ccx. tcx . infer_ctxt ( None , None , Reveal :: NotSpecializable ) . enter ( |infcx| {
199
- if let Err ( err) = infcx. eq_types ( false , origin. clone ( ) , t1 , t2 ) {
200
- infcx. report_mismatched_types ( origin, t1 , t2 , err) ;
199
+ if let Err ( err) = infcx. eq_types ( false , origin. clone ( ) , expected , actual ) {
200
+ infcx. report_mismatched_types ( origin, expected , actual , err) ;
201
201
false
202
202
} else {
203
203
true
@@ -246,8 +246,8 @@ fn check_main_fn_ty(ccx: &CrateCtxt,
246
246
require_same_types (
247
247
ccx,
248
248
TypeOrigin :: MainFunctionType ( main_span) ,
249
- main_t ,
250
- se_ty ) ;
249
+ se_ty ,
250
+ main_t ) ;
251
251
}
252
252
_ => {
253
253
span_bug ! ( main_span,
@@ -302,8 +302,8 @@ fn check_start_fn_ty(ccx: &CrateCtxt,
302
302
require_same_types (
303
303
ccx,
304
304
TypeOrigin :: StartFunctionType ( start_span) ,
305
- start_t ,
306
- se_ty ) ;
305
+ se_ty ,
306
+ start_t ) ;
307
307
}
308
308
_ => {
309
309
span_bug ! ( start_span,
You can’t perform that action at this time.
0 commit comments