Fix rebase fallout and address some review comments.

src/librustc/ty/print/mod.rs

@@ -16,6 +16,14 @@ pub trait Print<'gcx, 'tcx, P> {
     fn print(&self, cx: P) -> Result<Self::Output, Self::Error>;
 }
 
+/// Interface for outputting user-facing "type-system entities"
+/// (paths, types, lifetimes, constants, etc.) as a side-effect
+/// (e.g. formatting, like `PrettyPrinter` implementors do) or by
+/// constructing some alternative representation (e.g. an AST),
+/// which the associated types allow passing through the methods.
+///
+/// For pretty-printing/formatting in particular, see `PrettyPrinter`.
+// FIXME(eddyb) find a better name, this is more general than "printing".
 pub trait Printer<'gcx: 'tcx, 'tcx>: Sized {
     type Error;
 

src/librustc/ty/structural_impls.rs

@@ -225,7 +225,7 @@ impl fmt::Debug for ty::FloatVarValue {
 
 impl fmt::Debug for ty::TraitRef<'tcx> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // HACK(eddyb) this is used across the compiler to print
+        // FIXME(#59188) this is used across the compiler to print
         // a `TraitRef` qualified (with the Self type explicit),
         // instead of having a different way to make that choice.
         write!(f, "<{} as {}>", self.self_ty(), self)

src/librustc_mir/borrow_check/mod.rs

@@ -12,7 +12,7 @@ use rustc::mir::{ClearCrossCrate, Local, Location, Mir, Mutability, Operand, Pla
 use rustc::mir::{Field, Projection, ProjectionElem, Rvalue, Statement, StatementKind};
 use rustc::mir::{Terminator, TerminatorKind};
 use rustc::ty::query::Providers;
-use rustc::ty::{self, DefIdTree, TyCtxt};
+use rustc::ty::{self, TyCtxt};
 
 use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder, Level};
 use rustc_data_structures::bit_set::BitSet;