rename items -> free_items · rust-lang/rust@1933969 (original) (raw)

`@@ -170,12 +170,12 @@ impl<'hir> Map<'hir> {

`

170

170

``

171

171

`#[inline]

`

172

172

`pub fn items(self) -> impl Iterator<Item = ItemId> + 'hir {

`

173

``

`-

self.tcx.hir_crate_items(()).items.iter().copied()

`

``

173

`+

self.tcx.hir_crate_items(()).free_items.iter().copied()

`

174

174

`}

`

175

175

``

176

176

`#[inline]

`

177

177

`pub fn module_items(self, module: LocalModDefId) -> impl Iterator<Item = ItemId> + 'hir {

`

178

``

`-

self.tcx.hir_module_items(module).items()

`

``

178

`+

self.tcx.hir_module_items(module).free_items()

`

179

179

`}

`

180

180

``

181

181

`pub fn def_key(self, def_id: LocalDefId) -> DefKey {

`

`@@ -422,7 +422,7 @@ impl<'hir> Map<'hir> {

`

422

422

`V: Visitor<'hir>,

`

423

423

`{

`

424

424

`let krate = self.tcx.hir_crate_items(());

`

425

``

`-

walk_list!(visitor, visit_item, krate.items().map(|id| self.item(id)));

`

``

425

`+

walk_list!(visitor, visit_item, krate.free_items().map(|id| self.item(id)));

`

426

426

`walk_list!(visitor, visit_trait_item, krate.trait_items().map(|id| self.trait_item(id)));

`

427

427

`walk_list!(visitor, visit_impl_item, krate.impl_items().map(|id| self.impl_item(id)));

`

428

428

`walk_list!(

`

`@@ -440,7 +440,7 @@ impl<'hir> Map<'hir> {

`

440

440

`V: Visitor<'hir>,

`

441

441

`{

`

442

442

`let module = self.tcx.hir_module_items(module);

`

443

``

`-

walk_list!(visitor, visit_item, module.items().map(|id| self.item(id)));

`

``

443

`+

walk_list!(visitor, visit_item, module.free_items().map(|id| self.item(id)));

`

444

444

`walk_list!(visitor, visit_trait_item, module.trait_items().map(|id| self.trait_item(id)));

`

445

445

`walk_list!(visitor, visit_impl_item, module.impl_items().map(|id| self.impl_item(id)));

`

446

446

`walk_list!(

`

`@@ -1201,7 +1201,7 @@ pub(super) fn hir_module_items(tcx: TyCtxt<'_>, module_id: LocalModDefId) -> Mod

`

1201

1201

`} = collector;

`

1202

1202

`return ModuleItems {

`

1203

1203

`submodules: submodules.into_boxed_slice(),

`

1204

``

`-

items: items.into_boxed_slice(),

`

``

1204

`+

free_items: items.into_boxed_slice(),

`

1205

1205

`trait_items: trait_items.into_boxed_slice(),

`

1206

1206

`impl_items: impl_items.into_boxed_slice(),

`

1207

1207

`foreign_items: foreign_items.into_boxed_slice(),

`

`@@ -1230,7 +1230,7 @@ pub(crate) fn hir_crate_items(tcx: TyCtxt<'_>, _: ()) -> ModuleItems {

`

1230

1230

``

1231

1231

`return ModuleItems {

`

1232

1232

`submodules: submodules.into_boxed_slice(),

`

1233

``

`-

items: items.into_boxed_slice(),

`

``

1233

`+

free_items: items.into_boxed_slice(),

`

1234

1234

`trait_items: trait_items.into_boxed_slice(),

`

1235

1235

`impl_items: impl_items.into_boxed_slice(),

`

1236

1236

`foreign_items: foreign_items.into_boxed_slice(),

`