Remove FinderTrait and move its functions into DocContext

Author: GuillaumeGomez

src/librustdoc/clean/auto_trait.rs

@@ -17,7 +17,6 @@ use rustc::middle::cstore::CrateStore;
 use std::fmt::Debug;
 
 use self::def_ctor::{get_def_from_def_id, get_def_from_node_id};
-use self::finder_trait::Finder;
 
 use super::*;
 
@@ -168,14 +167,14 @@ impl<'a, 'tcx, 'rcx, 'cstore> AutoTraitFinder<'a, 'tcx, 'rcx, 'cstore> {
                 _ => unreachable!(),
             };
             let real_name = name.map(|name| Ident::from_str(&name));
-            let ty = self.get_real_ty(def_id, def_ctor, &real_name, &generics);
+            let ty = self.cx.get_real_ty(def_id, def_ctor, &real_name, &generics);
 
             return Some(Item {
                 source: Span::empty(),
                 name: None,
                 attrs: Default::default(),
                 visibility: None,
-                def_id: self.next_def_id(def_id.krate),
+                def_id: self.cx.next_def_id(def_id.krate),
                 stability: None,
                 deprecation: None,
                 inner: ImplItem(Impl {
@@ -862,12 +861,6 @@ impl<'a, 'tcx, 'rcx, 'cstore> AutoTraitFinder<'a, 'tcx, 'rcx, 'cstore> {
     }
 }
 
-impl<'a, 'tcx: 'a, 'rcx: 'a> Finder<'a, 'tcx, 'rcx> for AutoTraitFinder<'a, 'tcx, 'rcx> {
-    fn get_cx(&self) -> &DocContext<'a, 'tcx, 'rcx> {
-        &self.cx
-    }
-}
-
 // Replaces all ReVars in a type with ty::Region's, using the provided map
 struct RegionReplacer<'a, 'gcx: 'a + 'tcx, 'tcx: 'a> {
     vid_to_region: &'a FxHashMap<ty::RegionVid, ty::Region<'tcx>>,

src/librustdoc/clean/blanket_impl.rs

@@ -20,7 +20,6 @@ use core::DocAccessLevels;
 use super::*;
 
 use self::def_ctor::{get_def_from_def_id, get_def_from_node_id};
-use self::finder_trait::Finder;
 
 pub struct BlanketImplFinder<'a, 'tcx: 'a, 'rcx: 'a> {
     pub cx: &'a core::DocContext<'a, 'tcx, 'rcx>,
@@ -127,15 +126,15 @@ impl<'a, 'tcx, 'rcx> BlanketImplFinder <'a, 'tcx, 'rcx> {
                                          .map(|meth| meth.ident.to_string())
                                          .collect();
 
-                            let ty = self.get_real_ty(def_id, def_ctor, &real_name, generics);
+                            let ty = self.cx.get_real_ty(def_id, def_ctor, &real_name, generics);
                             let predicates = infcx.tcx.predicates_of(impl_def_id);
 
                             impls.push(Item {
                                 source: infcx.tcx.def_span(impl_def_id).clean(self.cx),
                                 name: None,
                                 attrs: Default::default(),
                                 visibility: None,
-                                def_id: self.next_def_id(impl_def_id.krate),
+                                def_id: self.cx.next_def_id(impl_def_id.krate),
                                 stability: None,
                                 deprecation: None,
                                 inner: ImplItem(Impl {
@@ -161,9 +160,3 @@ impl<'a, 'tcx, 'rcx> BlanketImplFinder <'a, 'tcx, 'rcx> {
         impls
     }
 }
-
-impl<'a, 'tcx: 'a, 'rcx: 'a> Finder<'a, 'tcx, 'rcx> for BlanketImplFinder<'a, 'tcx, 'rcx> {
-    fn get_cx(&self) -> &DocContext<'a, 'tcx, 'rcx> {
-        &self.cx
-    }
-}

src/librustdoc/clean/finder_trait.rs

@@ -37,8 +37,7 @@ use rustc::middle::lang_items;
 use rustc::mir::interpret::GlobalId;
 use rustc::hir::{self, GenericArg, HirVec};
 use rustc::hir::def::{self, Def, CtorKind};
-use rustc::hir::def_id::{CrateNum, DefId, DefIndex, CRATE_DEF_INDEX, LOCAL_CRATE};
-use rustc::hir::def_id::DefIndexAddressSpace;
+use rustc::hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc::hir::map::Node;
 use rustc::ty::subst::Substs;
 use rustc::ty::{self, TyCtxt, Region, RegionVid, Ty, AdtKind};
@@ -75,13 +74,13 @@ mod simplify;
 mod auto_trait;
 mod blanket_impl;
 pub mod def_ctor;
-mod finder_trait;
 
 use self::cfg::Cfg;
 use self::auto_trait::AutoTraitFinder;
 use self::blanket_impl::BlanketImplFinder;
 
-thread_local!(static MAX_DEF_ID: RefCell<FxHashMap<CrateNum, DefId>> = RefCell::new(FxHashMap()));
+thread_local!(pub static MAX_DEF_ID: RefCell<FxHashMap<CrateNum, DefId>> =
+    RefCell::new(FxHashMap()));
 
 const FN_OUTPUT_NAME: &'static str = "Output";
 
@@ -4505,7 +4504,7 @@ pub fn path_to_def(tcx: &TyCtxt, path: &[&str]) -> Option<DefId> {
     }
 }
 
-fn get_path_for_type<F>(tcx: TyCtxt, def_id: DefId, def_ctor: F) -> hir::Path
+pub fn get_path_for_type<F>(tcx: TyCtxt, def_id: DefId, def_ctor: F) -> hir::Path
 where F: Fn(DefId) -> Def {
     struct AbsolutePathBuffer {
         names: Vec<String>,