diff options
| author | bors <bors@rust-lang.org> | 2023-03-29 21:57:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-29 21:57:11 +0000 |
| commit | 2fb0e8d162a021f8a795fb603f5d8c0017855160 (patch) | |
| tree | 9bff7eab583aa5f93f7186c4a891b9e3d3032c11 /compiler/rustc_codegen_llvm/src | |
| parent | 17c11672167827b0dd92c88ef69f24346d1286dd (diff) | |
| parent | 02cb4da8969ba2d9f2879df33fc13fce83012ed7 (diff) | |
| download | rust-2fb0e8d162a021f8a795fb603f5d8c0017855160.tar.gz rust-2fb0e8d162a021f8a795fb603f5d8c0017855160.zip | |
Auto merge of #109734 - matthiaskrgr:rollup-oy4nlli, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #107387 (Use random `HashMap` keys on Hermit) - #109511 (Make `EvalCtxt`'s `infcx` private) - #109554 (Suggest ..= when someone tries to create an overflowing range) - #109675 (Do not consider elaborated projection predicates for objects in new solver) - #109693 (Remove ~const from alloc) - #109700 (Lint against escape sequences in Fluent files) - #109716 (Move `mir::Field` → `abi::FieldIdx`) - #109726 (rustdoc: Don't strip crate module) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs index 54e850f2599..3e4765fba57 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs @@ -6,7 +6,7 @@ use rustc_hir::def::CtorKind; use rustc_index::vec::IndexVec; use rustc_middle::{ bug, - mir::{Field, GeneratorLayout, GeneratorSavedLocal}, + mir::{GeneratorLayout, GeneratorSavedLocal}, ty::{ self, layout::{IntegerExt, LayoutOf, PrimitiveExt, TyAndLayout}, @@ -14,7 +14,9 @@ use rustc_middle::{ }, }; use rustc_span::Symbol; -use rustc_target::abi::{HasDataLayout, Integer, Primitive, TagEncoding, VariantIdx, Variants}; +use rustc_target::abi::{ + FieldIdx, HasDataLayout, Integer, Primitive, TagEncoding, VariantIdx, Variants, +}; use std::borrow::Cow; use crate::{ @@ -353,7 +355,7 @@ pub fn build_generator_variant_struct_type_di_node<'ll, 'tcx>( let state_specific_fields: SmallVec<_> = (0..variant_layout.fields.count()) .map(|field_index| { let generator_saved_local = generator_layout.variant_fields[variant_index] - [Field::from_usize(field_index)]; + [FieldIdx::from_usize(field_index)]; let field_name_maybe = state_specific_upvar_names[generator_saved_local]; let field_name = field_name_maybe .as_ref() |