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

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

`

166

166

``

167

167

`#[inline]

`

168

168

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

`

169

``

`-

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

`

``

169

`+

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

`

170

170

`}

`

171

171

``

172

172

`#[inline]

`

173

173

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

`

174

``

`-

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

`

``

174

`+

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

`

175

175

`}

`

176

176

``

177

177

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

`

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

`

418

418

`V: Visitor<'hir>,

`

419

419

`{

`

420

420

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

`

421

``

`-

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

`

``

421

`+

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

`

422

422

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

`

423

423

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

`

424

424

`walk_list!(

`

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

`

436

436

`V: Visitor<'hir>,

`

437

437

`{

`

438

438

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

`

439

``

`-

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

`

``

439

`+

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

`

440

440

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

`

441

441

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

`

442

442

`walk_list!(

`

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

`

1197

1197

`} = collector;

`

1198

1198

`return ModuleItems {

`

1199

1199

`submodules: submodules.into_boxed_slice(),

`

1200

``

`-

items: items.into_boxed_slice(),

`

``

1200

`+

free_items: items.into_boxed_slice(),

`

1201

1201

`trait_items: trait_items.into_boxed_slice(),

`

1202

1202

`impl_items: impl_items.into_boxed_slice(),

`

1203

1203

`foreign_items: foreign_items.into_boxed_slice(),

`

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

`

1226

1226

``

1227

1227

`return ModuleItems {

`

1228

1228

`submodules: submodules.into_boxed_slice(),

`

1229

``

`-

items: items.into_boxed_slice(),

`

``

1229

`+

free_items: items.into_boxed_slice(),

`

1230

1230

`trait_items: trait_items.into_boxed_slice(),

`

1231

1231

`impl_items: impl_items.into_boxed_slice(),

`

1232

1232

`foreign_items: foreign_items.into_boxed_slice(),

`