Remove HirCollector::sess.

It's redundant w.r.t. `HirCollector::tcx`. This removes the unnecessary
`'a` lifetime.

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(
-&compiler.sess,
  tcx.hir(),
 ErrorCodes::from(compiler.sess.opts.unstable_features.is_nightly_build()),
  enable_per_target_ignores,

src/librustdoc/doctest/rust.rs

@@ -10,7 +10,6 @@ use rustc_middle::hir::map::Map;
 use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::TyCtxt;
 use rustc_resolve::rustdoc::span_of_fragments;
-use rustc_session::Session;
 use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos,DUMMY_SP,FileName,Pos,Span};
 
@@ -63,30 +62,28 @@ impl DocTestVisitor for RustCollector {
 fnvisit_header(&mutself,_name:&str,_level:u32){}
 }
 
-pub(super)structHirCollector<'a,'tcx>{
-sess:&'aSession,
+pub(super)structHirCollector<'tcx>{
 map:Map<'tcx>,
 codes:ErrorCodes,
 tcx:TyCtxt<'tcx>,
 enable_per_target_ignores:bool,
 collector:RustCollector,
 }
 
-impl<'a,'tcx>HirCollector<'a,'tcx>{
+impl<'tcx>HirCollector<'tcx>{
 pubfnnew(
-sess:&'aSession,
 map:Map<'tcx>,
 codes:ErrorCodes,
 enable_per_target_ignores:bool,
 tcx:TyCtxt<'tcx>,
 ) -> Self{
 let collector = RustCollector{
-source_map: sess.psess.clone_source_map(),
+source_map:tcx.sess.psess.clone_source_map(),
 cur_path:vec![],
 position:DUMMY_SP,
 tests:vec![],
 };
-Self{sess,map, codes, enable_per_target_ignores, tcx, collector }
+Self{ map, codes, enable_per_target_ignores, tcx, collector }
 }
 
 pubfncollect_crate(mutself) -> Vec<ScrapedDocTest>{
@@ -98,7 +95,7 @@ impl<'a, 'tcx> HirCollector<'a, 'tcx> {
 }
 }
 
-impl<'a,'tcx>HirCollector<'a,'tcx>{
+impl<'tcx>HirCollector<'tcx>{
 fnvisit_testable<F:FnOnce(&mutSelf)>(
 &mutself,
 name:String,
@@ -108,7 +105,7 @@ impl<'a, 'tcx> HirCollector<'a, 'tcx> {
 ){
 let ast_attrs = self.tcx.hir().attrs(self.tcx.local_def_id_to_hir_id(def_id));
 ifletSome(ref cfg) = ast_attrs.cfg(self.tcx,&FxHashSet::default()){
-if !cfg.matches(&self.sess.psess,Some(self.tcx.features())){
+if !cfg.matches(&self.tcx.sess.psess,Some(self.tcx.features())){
 return;
 }
 }
@@ -141,7 +138,7 @@ impl<'a, 'tcx> HirCollector<'a, 'tcx> {
 }
 }
 
-impl<'a,'tcx> intravisit::Visitor<'tcx>forHirCollector<'a,'tcx>{
+impl<'tcx> intravisit::Visitor<'tcx>forHirCollector<'tcx>{
 typeNestedFilter = nested_filter::All;
 
 fnnested_visit_map(&mutself) -> Self::Map{