Remove HirCollector::map.

Because `rustc_middle::hir::map::Map` is a trivial wrapper around
`TyCtxt`, and `HirCollector` has a `TyCtxt` field.

Author: nnethercote

src/librustdoc/doctest.rs

@@ -186,7 +186,6 @@ pub(crate) fn run(
 
 letmut collector = CreateRunnableDocTests::new(options, opts);
 let hir_collector = HirCollector::new(
- tcx.hir(),
 ErrorCodes::from(compiler.sess.opts.unstable_features.is_nightly_build()),
  enable_per_target_ignores,
  tcx,

src/librustdoc/doctest/rust.rs

@@ -6,7 +6,6 @@ use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::Lrc;
 use rustc_hir::def_id::{CRATE_DEF_ID,LocalDefId};
 use rustc_hir::{selfas hir,CRATE_HIR_ID, intravisit};
-use rustc_middle::hir::map::Map;
 use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::TyCtxt;
 use rustc_resolve::rustdoc::span_of_fragments;
@@ -63,27 +62,21 @@ impl DocTestVisitor for RustCollector {
 }
 
 pub(super)structHirCollector<'tcx>{
-map:Map<'tcx>,
 codes:ErrorCodes,
 tcx:TyCtxt<'tcx>,
 enable_per_target_ignores:bool,
 collector:RustCollector,
 }
 
 impl<'tcx>HirCollector<'tcx>{
-pubfnnew(
-map:Map<'tcx>,
-codes:ErrorCodes,
-enable_per_target_ignores:bool,
-tcx:TyCtxt<'tcx>,
-) -> Self{
+pubfnnew(codes:ErrorCodes,enable_per_target_ignores:bool,tcx:TyCtxt<'tcx>) -> Self{
 let collector = RustCollector{
 source_map: tcx.sess.psess.clone_source_map(),
 cur_path:vec![],
 position:DUMMY_SP,
 tests:vec![],
 };
-Self{map,codes, enable_per_target_ignores, tcx, collector }
+Self{ codes, enable_per_target_ignores, tcx, collector }
 }
 
 pubfncollect_crate(mutself) -> Vec<ScrapedDocTest>{
@@ -142,13 +135,13 @@ impl<'tcx> intravisit::Visitor<'tcx> for HirCollector<'tcx> {
 typeNestedFilter = nested_filter::All;
 
 fnnested_visit_map(&mutself) -> Self::Map{
-self.map
+self.tcx.hir()
 }
 
 fnvisit_item(&mutself,item:&'tcx hir::Item<'_>){
 let name = match&item.kind{
  hir::ItemKind::Impl(impl_) => {
- rustc_hir_pretty::id_to_string(&self.map, impl_.self_ty.hir_id)
+ rustc_hir_pretty::id_to_string(&self.tcx.hir(), impl_.self_ty.hir_id)
 }
  _ => item.ident.to_string(),
 };