Rollup merge of #129689 - compiler-errors:impl-lifetime, r=michaelwoerister

Move `'tcx` lifetime off of impl and onto methods for `CrateMetadataRef`

Unconstrained type and const variables are not allowed, but unconstrained lifetimes are. This is not very good style, though, and it leads to unnecessary captures of a lifetime in edition 2024 (not that it matters, but it does trigger the edition migration lint).
This commit is contained in:
Jubilee 2024-08-28 19:12:54 -07:00 committed by GitHub
commit 472d164a49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -962,7 +962,7 @@ pub(crate) fn decode_crate_deps<'a>(
} }
} }
impl<'a, 'tcx> CrateMetadataRef<'a> { impl<'a> CrateMetadataRef<'a> {
fn missing(self, descr: &str, id: DefIndex) -> ! { fn missing(self, descr: &str, id: DefIndex) -> ! {
bug!("missing `{descr}` for {:?}", self.local_def_id(id)) bug!("missing `{descr}` for {:?}", self.local_def_id(id))
} }
@ -1036,7 +1036,7 @@ fn get_span(self, index: DefIndex, sess: &Session) -> Span {
.decode((self, sess)) .decode((self, sess))
} }
fn load_proc_macro(self, id: DefIndex, tcx: TyCtxt<'tcx>) -> SyntaxExtension { fn load_proc_macro<'tcx>(self, id: DefIndex, tcx: TyCtxt<'tcx>) -> SyntaxExtension {
let (name, kind, helper_attrs) = match *self.raw_proc_macro(id) { let (name, kind, helper_attrs) = match *self.raw_proc_macro(id) {
ProcMacro::CustomDerive { trait_name, attributes, client } => { ProcMacro::CustomDerive { trait_name, attributes, client } => {
let helper_attrs = let helper_attrs =
@ -1070,7 +1070,7 @@ fn load_proc_macro(self, id: DefIndex, tcx: TyCtxt<'tcx>) -> SyntaxExtension {
) )
} }
fn get_explicit_item_bounds( fn get_explicit_item_bounds<'tcx>(
self, self,
index: DefIndex, index: DefIndex,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
@ -1084,7 +1084,7 @@ fn get_explicit_item_bounds(
ty::EarlyBinder::bind(&*output) ty::EarlyBinder::bind(&*output)
} }
fn get_explicit_item_super_predicates( fn get_explicit_item_super_predicates<'tcx>(
self, self,
index: DefIndex, index: DefIndex,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
@ -1141,7 +1141,7 @@ fn get_variant(
) )
} }
fn get_adt_def(self, item_id: DefIndex, tcx: TyCtxt<'tcx>) -> ty::AdtDef<'tcx> { fn get_adt_def<'tcx>(self, item_id: DefIndex, tcx: TyCtxt<'tcx>) -> ty::AdtDef<'tcx> {
let kind = self.def_kind(item_id); let kind = self.def_kind(item_id);
let did = self.local_def_id(item_id); let did = self.local_def_id(item_id);
@ -1225,12 +1225,12 @@ fn get_lib_features(self) -> LibFeatures {
/// Iterates over the stability implications in the given crate (when a `#[unstable]` attribute /// Iterates over the stability implications in the given crate (when a `#[unstable]` attribute
/// has an `implied_by` meta item, then the mapping from the implied feature to the actual /// has an `implied_by` meta item, then the mapping from the implied feature to the actual
/// feature is a stability implication). /// feature is a stability implication).
fn get_stability_implications(self, tcx: TyCtxt<'tcx>) -> &'tcx [(Symbol, Symbol)] { fn get_stability_implications<'tcx>(self, tcx: TyCtxt<'tcx>) -> &'tcx [(Symbol, Symbol)] {
tcx.arena.alloc_from_iter(self.root.stability_implications.decode(self)) tcx.arena.alloc_from_iter(self.root.stability_implications.decode(self))
} }
/// Iterates over the lang items in the given crate. /// Iterates over the lang items in the given crate.
fn get_lang_items(self, tcx: TyCtxt<'tcx>) -> &'tcx [(DefId, LangItem)] { fn get_lang_items<'tcx>(self, tcx: TyCtxt<'tcx>) -> &'tcx [(DefId, LangItem)] {
tcx.arena.alloc_from_iter( tcx.arena.alloc_from_iter(
self.root self.root
.lang_items .lang_items
@ -1239,7 +1239,11 @@ fn get_lang_items(self, tcx: TyCtxt<'tcx>) -> &'tcx [(DefId, LangItem)] {
) )
} }
fn get_stripped_cfg_items(self, cnum: CrateNum, tcx: TyCtxt<'tcx>) -> &'tcx [StrippedCfgItem] { fn get_stripped_cfg_items<'tcx>(
self,
cnum: CrateNum,
tcx: TyCtxt<'tcx>,
) -> &'tcx [StrippedCfgItem] {
let item_names = self let item_names = self
.root .root
.stripped_cfg_items .stripped_cfg_items
@ -1412,7 +1416,7 @@ fn get_item_attrs(
.decode((self, sess)) .decode((self, sess))
} }
fn get_inherent_implementations_for_type( fn get_inherent_implementations_for_type<'tcx>(
self, self,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
id: DefIndex, id: DefIndex,
@ -1439,7 +1443,7 @@ fn get_trait_impls(self) -> impl Iterator<Item = DefId> + 'a {
}) })
} }
fn get_incoherent_impls(self, tcx: TyCtxt<'tcx>, simp: SimplifiedType) -> &'tcx [DefId] { fn get_incoherent_impls<'tcx>(self, tcx: TyCtxt<'tcx>, simp: SimplifiedType) -> &'tcx [DefId] {
if let Some(impls) = self.cdata.incoherent_impls.get(&simp) { if let Some(impls) = self.cdata.incoherent_impls.get(&simp) {
tcx.arena.alloc_from_iter(impls.decode(self).map(|idx| self.local_def_id(idx))) tcx.arena.alloc_from_iter(impls.decode(self).map(|idx| self.local_def_id(idx)))
} else { } else {
@ -1447,7 +1451,7 @@ fn get_incoherent_impls(self, tcx: TyCtxt<'tcx>, simp: SimplifiedType) -> &'tcx
} }
} }
fn get_implementations_of_trait( fn get_implementations_of_trait<'tcx>(
self, self,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
trait_def_id: DefId, trait_def_id: DefId,
@ -1491,7 +1495,7 @@ fn get_foreign_modules(self, sess: &'a Session) -> impl Iterator<Item = ForeignM
self.root.foreign_modules.decode((self, sess)) self.root.foreign_modules.decode((self, sess))
} }
fn get_dylib_dependency_formats( fn get_dylib_dependency_formats<'tcx>(
self, self,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
) -> &'tcx [(CrateNum, LinkagePreference)] { ) -> &'tcx [(CrateNum, LinkagePreference)] {
@ -1503,11 +1507,11 @@ fn get_dylib_dependency_formats(
) )
} }
fn get_missing_lang_items(self, tcx: TyCtxt<'tcx>) -> &'tcx [LangItem] { fn get_missing_lang_items<'tcx>(self, tcx: TyCtxt<'tcx>) -> &'tcx [LangItem] {
tcx.arena.alloc_from_iter(self.root.lang_items_missing.decode(self)) tcx.arena.alloc_from_iter(self.root.lang_items_missing.decode(self))
} }
fn exported_symbols( fn exported_symbols<'tcx>(
self, self,
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
) -> &'tcx [(ExportedSymbol<'tcx>, SymbolExportInfo)] { ) -> &'tcx [(ExportedSymbol<'tcx>, SymbolExportInfo)] {