Change AssocItems to Vec<AssocItem>.

Author: makai410

compiler/rustc_smir/src/rustc_smir/context.rs

@@ -823,23 +823,17 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
         ty.stable(&mut *tables)
     }
 
-    fn associated_items(&self, def_id: stable_mir::DefId) -> stable_mir::ty::AssocItems {
+    fn associated_items(&self, def_id: stable_mir::DefId) -> stable_mir::AssocItems {
         let mut tables = self.0.borrow_mut();
         let tcx = tables.tcx;
         let def_id = tables[def_id];
         let assoc_items = if tcx.is_trait_alias(def_id) {
-            stable_mir::ty::AssocItems { items: Vec::new() }
+            Vec::new()
         } else {
-            let items: Vec<(Symbol, stable_mir::ty::AssocItem)> = tcx
-                .associated_item_def_ids(def_id)
+            tcx.associated_item_def_ids(def_id)
                 .iter()
-                .map(|did| {
-                    let item = tcx.associated_item(*did).stable(&mut *tables);
-                    (item.name.clone(), item)
-                })
-                .collect();
-
-            stable_mir::ty::AssocItems { items }
+                .map(|did| tcx.associated_item(*did).stable(&mut *tables))
+                .collect()
         };
         assoc_items
     }

compiler/stable_mir/src/compiler_interface.rs

@@ -12,14 +12,14 @@ use crate::mir::mono::{Instance, InstanceDef, StaticDef};
 use crate::mir::{BinOp, Body, Place, UnOp};
 use crate::target::MachineInfo;
 use crate::ty::{
-    AdtDef, AdtKind, Allocation, AssocItems, ClosureDef, ClosureKind, FieldDef, FnDef, ForeignDef,
+    AdtDef, AdtKind, Allocation, ClosureDef, ClosureKind, FieldDef, FnDef, ForeignDef,
     ForeignItemKind, ForeignModule, ForeignModuleDef, GenericArgs, GenericPredicates, Generics,
     ImplDef, ImplTrait, IntrinsicDef, LineInfo, MirConst, PolyFnSig, RigidTy, Span, TraitDecl,
     TraitDef, Ty, TyConst, TyConstId, TyKind, UintTy, VariantDef,
 };
 use crate::{
-    Crate, CrateItem, CrateItems, CrateNum, DefId, Error, Filename, ImplTraitDecls, ItemKind,
-    Symbol, TraitDecls, mir,
+    AssocItems, Crate, CrateItem, CrateItems, CrateNum, DefId, Error, Filename, ImplTraitDecls,
+    ItemKind, Symbol, TraitDecls, mir,
 };
 
 /// This trait defines the interface between stable_mir and the Rust compiler.

compiler/stable_mir/src/crate_def.rs

@@ -3,8 +3,8 @@
 
 use serde::Serialize;
 
-use crate::ty::{AssocItems, GenericArgs, Span, Ty};
-use crate::{Crate, Symbol, with};
+use crate::ty::{GenericArgs, Span, Ty};
+use crate::{AssocItems, Crate, Symbol, with};
 
 /// A unique identification number for each item accessible for the current compilation unit.
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Serialize)]

compiler/stable_mir/src/lib.rs

@@ -27,7 +27,7 @@ pub use crate::crate_def::{CrateDef, CrateDefItems, CrateDefType, DefId};
 pub use crate::error::*;
 use crate::mir::mono::StaticDef;
 use crate::mir::{Body, Mutability};
-use crate::ty::{FnDef, ForeignModuleDef, ImplDef, IndexedVal, Span, TraitDef, Ty};
+use crate::ty::{AssocItem, FnDef, ForeignModuleDef, ImplDef, IndexedVal, Span, TraitDef, Ty};
 
 pub mod abi;
 #[macro_use]
@@ -71,6 +71,9 @@ pub type TraitDecls = Vec<TraitDef>;
 /// A list of impl trait decls.
 pub type ImplTraitDecls = Vec<ImplDef>;
 
+/// A list of associated items.
+pub type AssocItems = Vec<AssocItem>;
+
 /// Holds information about a crate.
 #[derive(Clone, PartialEq, Eq, Debug, Serialize)]
 pub struct Crate {

compiler/stable_mir/src/ty.rs

@@ -10,7 +10,7 @@ use crate::crate_def::{CrateDef, CrateDefItems, CrateDefType};
 use crate::mir::alloc::{AllocId, read_target_int, read_target_uint};
 use crate::mir::mono::StaticDef;
 use crate::target::MachineInfo;
-use crate::{Filename, Opaque};
+use crate::{AssocItems, Filename, Opaque};
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize)]
 pub struct Ty(usize);
@@ -777,7 +777,7 @@ impl CrateDefItems for AdtDef {
     fn associated_items(&self) -> AssocItems {
         match &self.kind() {
             AdtKind::Enum | AdtKind::Struct => with(|cx| cx.associated_items(self.def_id())),
-            AdtKind::Union => AssocItems { items: Vec::new() },
+            AdtKind::Union => Vec::new(),
         }
     }
 }
@@ -1573,11 +1573,6 @@ pub struct VariantIdx(usize);
 
 index_impl!(VariantIdx);
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
-pub struct AssocItems {
-    pub items: Vec<(Symbol, AssocItem)>,
-}
-
 crate_def! {
     /// Hold infomation about an Opaque definition, particularly useful in `RPITIT`.
     #[derive(Serialize)]