diff options
| author | bors <bors@rust-lang.org> | 2022-01-25 18:53:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-25 18:53:45 +0000 |
| commit | 8cdb3cd94efece1e17cbd8f6edb1dc1a482779a0 (patch) | |
| tree | c9ad500d9e577e1f44ca1271d17a5e29fc1926fa /compiler/rustc_metadata/src | |
| parent | 92ed8747f255b2695c33b64982e6959711a72cb9 (diff) | |
| parent | c8941d3e48715000620142c2e2495eae8e38921e (diff) | |
| download | rust-8cdb3cd94efece1e17cbd8f6edb1dc1a482779a0.tar.gz rust-8cdb3cd94efece1e17cbd8f6edb1dc1a482779a0.zip | |
Auto merge of #93095 - Aaron1011:remove-assoc-ident, r=cjgillot
Store a `Symbol` instead of an `Ident` in `AssocItem` This is the same idea as #92533, but for `AssocItem` instead of `VariantDef`/`FieldDef`. With this change, we no longer have any uses of `#[stable_hasher(project(...))]`
Diffstat (limited to 'compiler/rustc_metadata/src')
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/decoder.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/encoder.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs index 5474d92072e..4f0f20ce5a3 100644 --- a/compiler/rustc_metadata/src/rmeta/decoder.rs +++ b/compiler/rustc_metadata/src/rmeta/decoder.rs @@ -1279,7 +1279,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> { }; ty::AssocItem { - ident, + name: ident.name, kind, vis: self.get_visibility(id), defaultness: container.defaultness(), diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs index 809e5ee2c64..3fae652ee2e 100644 --- a/compiler/rustc_metadata/src/rmeta/encoder.rs +++ b/compiler/rustc_metadata/src/rmeta/encoder.rs @@ -1291,7 +1291,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> { record!(self.tables.kind[def_id] <- EntryKind::AssocType(container)); } } - self.encode_ident_span(def_id, impl_item.ident); + self.encode_ident_span(def_id, impl_item.ident(self.tcx)); self.encode_item_type(def_id); if let Some(trait_item_def_id) = impl_item.trait_item_def_id { record!(self.tables.trait_item_def_id[def_id] <- trait_item_def_id); |
