diff options
| author | bors <bors@rust-lang.org> | 2023-03-31 03:36:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-31 03:36:18 +0000 |
| commit | eb3e9c1f45981b47160543cfd882ca00e69bbfab (patch) | |
| tree | cc4747b6e59743312330bab4400848109101043d /compiler/rustc_monomorphize/src | |
| parent | 276029deae08ad5b62f7d1ef2ea1acb7f5f529d8 (diff) | |
| parent | 4abb45552992da2c30df9626c1b522b3d10f789b (diff) | |
| download | rust-eb3e9c1f45981b47160543cfd882ca00e69bbfab.tar.gz rust-eb3e9c1f45981b47160543cfd882ca00e69bbfab.zip | |
Auto merge of #109762 - scottmcm:variantdef-indexvec, r=WaffleLapkin
Update `ty::VariantDef` to use `IndexVec<FieldIdx, FieldDef>` And while doing the updates for that, also uses `FieldIdx` in `ProjectionKind::Field` and `TypeckResults::field_indices`. There's more places that could use it (like `rustc_const_eval` and `LayoutS`), but I tried to keep this PR from exploding to *even more* places. Part 2/? of https://github.com/rust-lang/compiler-team/issues/606
Diffstat (limited to 'compiler/rustc_monomorphize/src')
| -rw-r--r-- | compiler/rustc_monomorphize/src/collector.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_monomorphize/src/collector.rs b/compiler/rustc_monomorphize/src/collector.rs index 7ca18fca18c..d34fa39352f 100644 --- a/compiler/rustc_monomorphize/src/collector.rs +++ b/compiler/rustc_monomorphize/src/collector.rs @@ -1119,7 +1119,8 @@ fn find_vtable_types_for_unsizing<'tcx>( let target_fields = &target_adt_def.non_enum_variant().fields; assert!( - coerce_index < source_fields.len() && source_fields.len() == target_fields.len() + coerce_index.index() < source_fields.len() + && source_fields.len() == target_fields.len() ); find_vtable_types_for_unsizing( |