rustc: don't pass Namespace explicitly, but rather track it in FmtPrinter.

Author: eddyb

src/librustc/infer/error_reporting/mod.rs

@@ -445,7 +445,6 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
         terr: &TypeError<'tcx>,
         sp: Span,
     ) {
-        use hir::def::Namespace;
         use hir::def_id::CrateNum;
         use ty::print::{PrintCx, Printer};
         use ty::subst::Substs;
@@ -485,7 +484,6 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                 self: PrintCx<'_, '_, 'tcx, Self>,
                 _self_ty: Ty<'tcx>,
                 _trait_ref: Option<ty::TraitRef<'tcx>>,
-                _ns: Namespace,
             ) -> Result<Self::Path, Self::Error> {
                 Err(NonTrivialPath)
             }
@@ -518,7 +516,6 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                 ) -> Result<Self::Path, Self::Error>,
                 _params: &[ty::GenericParamDef],
                 _substs: &'tcx Substs<'tcx>,
-                _ns: Namespace,
                 _projections: impl Iterator<Item = ty::ExistentialProjection<'tcx>>,
             ) -> Result<Self::Path, Self::Error> {
                 print_prefix(self)
@@ -531,7 +528,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
             if !(did1.is_local() || did2.is_local()) && did1.krate != did2.krate {
                 let abs_path = |def_id| {
                     PrintCx::with(self.tcx, AbsolutePathPrinter, |cx| {
-                        cx.print_def_path(def_id, None, Namespace::TypeNS, iter::empty())
+                        cx.print_def_path(def_id, None, iter::empty())
                     })
                 };
 

src/librustc/infer/error_reporting/need_type_info.rs

@@ -1,3 +1,4 @@
+use hir::def::Namespace;
 use hir::{self, Local, Pat, Body, HirId};
 use hir::intravisit::{self, Visitor, NestedVisitorMap};
 use infer::InferCtxt;
@@ -79,7 +80,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
         }
 
         let mut s = String::new();
-        let mut printer = ty::print::FmtPrinter::new(&mut s);
+        let mut printer = ty::print::FmtPrinter::new(&mut s, Namespace::TypeNS);
         if let Some(highlight) = highlight {
             printer.region_highlight_mode = highlight;
         }

src/librustc/infer/error_reporting/nice_region_error/placeholder_error.rs

@@ -1,3 +1,4 @@
+use hir::def::Namespace;
 use hir::def_id::DefId;
 use infer::error_reporting::nice_region_error::NiceRegionError;
 use infer::lexical_region_resolve::RegionResolutionError;
@@ -245,7 +246,7 @@ impl NiceRegionError<'me, 'gcx, 'tcx> {
 
         {
             let mut note = String::new();
-            let mut printer = ty::print::FmtPrinter::new(&mut note);
+            let mut printer = ty::print::FmtPrinter::new(&mut note, Namespace::TypeNS);
             printer.region_highlight_mode.maybe_highlighting_region(sub_placeholder, has_sub);
             printer.region_highlight_mode.maybe_highlighting_region(sup_placeholder, has_sup);
 
@@ -279,7 +280,7 @@ impl NiceRegionError<'me, 'gcx, 'tcx> {
 
         {
             let mut note = String::new();
-            let mut printer = ty::print::FmtPrinter::new(&mut note);
+            let mut printer = ty::print::FmtPrinter::new(&mut note, Namespace::TypeNS);
             printer.region_highlight_mode.maybe_highlighting_region(vid, has_vid);
 
             let _ = ty::print::PrintCx::with(self.tcx, printer, |mut cx| {

src/librustc/mir/mod.rs

@@ -2341,7 +2341,8 @@ impl<'tcx> Debug for Rvalue<'tcx> {
                 };
 
                 // When printing regions, add trailing space if necessary.
-                ty::print::PrintCx::with_tls_tcx(ty::print::FmtPrinter::new(fmt), |cx| {
+                let ns = Namespace::ValueNS;
+                ty::print::PrintCx::with_tls_tcx(ty::print::FmtPrinter::new(fmt, ns), |cx| {
                     let region = if cx.config.is_verbose || cx.config.identify_regions {
                         let mut region = region.to_string();
                         if region.len() > 0 {