@@ -129,7 +129,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
129129 element. size . checked_mul ( count, & self . cx ) . ok_or ( LayoutCalculatorError :: SizeOverflow ) ?;
130130
131131 Ok ( LayoutData {
132- variants : Variants :: Single { index : VariantIdx :: new ( 0 ) } ,
132+ variants : Variants :: Single { index : VariantIdx :: ZERO } ,
133133 fields : FieldsShape :: Array { stride : element. size , count } ,
134134 backend_repr : BackendRepr :: Memory { sized : count_if_sized. is_some ( ) } ,
135135 largest_niche : element. largest_niche . filter ( |_| count != 0 ) ,
@@ -186,7 +186,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
186186 let size = size. align_to ( align. abi ) ;
187187
188188 Ok ( LayoutData {
189- variants : Variants :: Single { index : VariantIdx :: new ( 0 ) } ,
189+ variants : Variants :: Single { index : VariantIdx :: ZERO } ,
190190 fields : FieldsShape :: Arbitrary {
191191 offsets : [ Size :: ZERO ] . into ( ) ,
192192 memory_index : [ 0 ] . into ( ) ,
@@ -336,7 +336,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
336336 }
337337 // If it's a struct, still compute a layout so that we can still compute the
338338 // field offsets.
339- None => VariantIdx :: new ( 0 ) ,
339+ None => VariantIdx :: ZERO ,
340340 } ;
341341
342342 // take the struct path if it is an actual struct
@@ -393,7 +393,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
393393 } ;
394394
395395 let mut size = Size :: ZERO ;
396- let only_variant_idx = VariantIdx :: new ( 0 ) ;
396+ let only_variant_idx = VariantIdx :: ZERO ;
397397 let only_variant = & variants[ only_variant_idx] ;
398398 for field in only_variant {
399399 if field. is_unsized ( ) {
@@ -1461,7 +1461,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
14611461 let seed = field_seed. wrapping_add ( repr. field_shuffle_seed ) ;
14621462
14631463 Ok ( LayoutData {
1464- variants : Variants :: Single { index : VariantIdx :: new ( 0 ) } ,
1464+ variants : Variants :: Single { index : VariantIdx :: ZERO } ,
14651465 fields : FieldsShape :: Arbitrary { offsets, memory_index } ,
14661466 backend_repr : abi,
14671467 largest_niche,
0 commit comments