bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #137334 - compiler-errors:edition-2024-fresh-2, r=saethlin,traviscross

Browse source 
Greatly simplify lifetime captures in edition 2024

Remove most of the `+ Captures` and `+ '_` from the compiler, since they are now unnecessary with the new edition 2021 lifetime capture rules. Use some `+ 'tcx` and `+ 'static` rather than being overly verbose with precise capturing syntax.
This commit is contained in:
Jacob Pratt 2025-02-23 02:44:18 -05:00 • committed by GitHub
commit 7f14d2eba4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
84 changed files with 223 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir/src/definitions.rs
View file

@ -93,7 +93,7 @@ impl DefPathTable {
pub fn enumerated_keys_and_path_hashes(
&self,
) -> impl Iterator<Item = (DefIndex, &DefKey, DefPathHash)> + ExactSizeIterator + '_ {
) -> impl Iterator<Item = (DefIndex, &DefKey, DefPathHash)> + ExactSizeIterator {
self.index_to_key
.iter_enumerated()
.map(move |(index, key)| (index, key, self.def_path_hash(index)))

2
compiler/rustc_hir/src/lang_items.rs
View file

@ -60,7 +60,7 @@ impl LanguageItems {
self.reverse_items.get(&def_id).copied()
}
pub fn iter(&self) -> impl Iterator<Item = (LangItem, DefId)> + '_ {
pub fn iter(&self) -> impl Iterator<Item = (LangItem, DefId)> {
self.items
.iter()
.enumerate()