@@ -250,13 +250,13 @@ pub(crate) fn compile_constant_expression_to_constant(
250
250
fn create_array_from_vec (
251
251
lookup : & mut LookupEnv ,
252
252
elem_type : crate :: TypeId ,
253
- element_typs : Vec < crate :: TypeId > ,
253
+ element_types : Vec < crate :: TypeId > ,
254
254
element_vals : Vec < Constant > ,
255
255
) -> Option < Constant > {
256
256
let te = lookup. engines . te ( ) ;
257
257
assert ! ( {
258
258
let unify_check = UnifyCheck :: coercion( lookup. engines) ;
259
- element_typs
259
+ element_types
260
260
. iter( )
261
261
. all( |tid| unify_check. check( * tid, elem_type) )
262
262
} ) ;
@@ -266,7 +266,7 @@ fn create_array_from_vec(
266
266
lookup. engines . de ( ) ,
267
267
lookup. context ,
268
268
elem_type,
269
- element_typs . len ( ) . try_into ( ) . unwrap ( ) ,
269
+ element_types . len ( ) . try_into ( ) . unwrap ( ) ,
270
270
)
271
271
. map_or ( None , |array_ty| {
272
272
Some ( ConstantContent :: new_array (
@@ -384,13 +384,13 @@ fn const_eval_typed_expr(
384
384
instantiation_span,
385
385
..
386
386
} => {
387
- let ( mut field_typs , mut field_vals) : ( Vec < _ > , Vec < _ > ) = ( vec ! [ ] , vec ! [ ] ) ;
387
+ let ( mut field_types , mut field_vals) : ( Vec < _ > , Vec < _ > ) = ( vec ! [ ] , vec ! [ ] ) ;
388
388
389
389
for field in fields {
390
390
let ty:: TyStructExpressionField { name : _, value, .. } = field;
391
391
let eval_expr_opt = const_eval_typed_expr ( lookup, known_consts, value) ?;
392
392
if let Some ( cv) = eval_expr_opt {
393
- field_typs . push ( value. return_type ) ;
393
+ field_types . push ( value. return_type ) ;
394
394
field_vals. push ( cv) ;
395
395
} else {
396
396
return Err ( ConstEvalError :: CannotBeEvaluatedToConst {
@@ -399,14 +399,14 @@ fn const_eval_typed_expr(
399
399
}
400
400
}
401
401
402
- assert ! ( field_typs . len( ) == fields. len( ) ) ;
402
+ assert ! ( field_types . len( ) == fields. len( ) ) ;
403
403
assert ! ( field_vals. len( ) == fields. len( ) ) ;
404
404
405
405
get_struct_for_types (
406
406
lookup. engines . te ( ) ,
407
407
lookup. engines . de ( ) ,
408
408
lookup. context ,
409
- & field_typs ,
409
+ & field_types ,
410
410
)
411
411
. map_or ( None , |struct_ty| {
412
412
let c = ConstantContent :: new_struct (
@@ -422,12 +422,12 @@ fn const_eval_typed_expr(
422
422
} )
423
423
}
424
424
ty:: TyExpressionVariant :: Tuple { fields } => {
425
- let ( mut field_typs , mut field_vals) : ( Vec < _ > , Vec < _ > ) = ( vec ! [ ] , vec ! [ ] ) ;
425
+ let ( mut field_types , mut field_vals) : ( Vec < _ > , Vec < _ > ) = ( vec ! [ ] , vec ! [ ] ) ;
426
426
427
427
for value in fields {
428
428
let eval_expr_opt = const_eval_typed_expr ( lookup, known_consts, value) ?;
429
429
if let Some ( cv) = eval_expr_opt {
430
- field_typs . push ( value. return_type ) ;
430
+ field_types . push ( value. return_type ) ;
431
431
field_vals. push ( cv) ;
432
432
} else {
433
433
return Err ( ConstEvalError :: CannotBeEvaluatedToConst {
@@ -436,14 +436,14 @@ fn const_eval_typed_expr(
436
436
}
437
437
}
438
438
439
- assert ! ( field_typs . len( ) == fields. len( ) ) ;
439
+ assert ! ( field_types . len( ) == fields. len( ) ) ;
440
440
assert ! ( field_vals. len( ) == fields. len( ) ) ;
441
441
442
442
create_tuple_aggregate (
443
443
lookup. engines . te ( ) ,
444
444
lookup. engines . de ( ) ,
445
445
lookup. context ,
446
- & field_typs ,
446
+ & field_types ,
447
447
)
448
448
. map_or ( None , |tuple_ty| {
449
449
let c = ConstantContent :: new_struct (
@@ -462,12 +462,12 @@ fn const_eval_typed_expr(
462
462
elem_type,
463
463
contents,
464
464
} => {
465
- let ( mut element_typs , mut element_vals) : ( Vec < _ > , Vec < _ > ) = ( vec ! [ ] , vec ! [ ] ) ;
465
+ let ( mut element_types , mut element_vals) : ( Vec < _ > , Vec < _ > ) = ( vec ! [ ] , vec ! [ ] ) ;
466
466
467
467
for value in contents {
468
468
let eval_expr_opt = const_eval_typed_expr ( lookup, known_consts, value) ?;
469
469
if let Some ( cv) = eval_expr_opt {
470
- element_typs . push ( value. return_type ) ;
470
+ element_types . push ( value. return_type ) ;
471
471
element_vals. push ( cv) ;
472
472
} else {
473
473
return Err ( ConstEvalError :: CannotBeEvaluatedToConst {
@@ -476,10 +476,10 @@ fn const_eval_typed_expr(
476
476
}
477
477
}
478
478
479
- assert ! ( element_typs . len( ) == contents. len( ) ) ;
479
+ assert ! ( element_types . len( ) == contents. len( ) ) ;
480
480
assert ! ( element_vals. len( ) == contents. len( ) ) ;
481
481
482
- create_array_from_vec ( lookup, * elem_type, element_typs , element_vals)
482
+ create_array_from_vec ( lookup, * elem_type, element_types , element_vals)
483
483
}
484
484
ty:: TyExpressionVariant :: ArrayRepeat {
485
485
elem_type,
@@ -493,12 +493,12 @@ fn const_eval_typed_expr(
493
493
. as_uint ( )
494
494
. unwrap ( ) as usize ;
495
495
let element_vals = ( 0 ..length) . map ( |_| constant) . collect :: < Vec < _ > > ( ) ;
496
- let element_typs = ( 0 ..length) . map ( |_| value. return_type ) . collect :: < Vec < _ > > ( ) ;
496
+ let element_types = ( 0 ..length) . map ( |_| value. return_type ) . collect :: < Vec < _ > > ( ) ;
497
497
498
- assert ! ( element_typs . len( ) == length) ;
498
+ assert ! ( element_types . len( ) == length) ;
499
499
assert ! ( element_vals. len( ) == length) ;
500
500
501
- create_array_from_vec ( lookup, * elem_type, element_typs , element_vals)
501
+ create_array_from_vec ( lookup, * elem_type, element_types , element_vals)
502
502
}
503
503
ty:: TyExpressionVariant :: EnumInstantiation {
504
504
enum_ref,
0 commit comments