rustc: implement fmt::{Debug,Display} on Ty instead of TyS.

diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
index 7f41947fbb929186cb1fdb7150fefd62ecad8cda..6d09f72a76b040ca63b0485bfe8b01496a2baf0a 100644 (file)
--- a/src/librustc/util/ppaux.rs
+++ b/src/librustc/util/ppaux.rs
@@ -1124,7 +1124,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 }
 
 define_print! {
-    ('tcx) ty::TyS<'tcx>, (self, f, cx) {
+    ('tcx) ty::Ty<'tcx>, (self, f, cx) {
         display {
             match self.sty {
                 Bool => write!(f, "bool"),

diff --git a/src/librustc_mir/util/graphviz.rs b/src/librustc_mir/util/graphviz.rs
index 61b1a5a850d28b0124d5ebf0ace66107ed44050d..41e16684b8ac5e1ca8f46bdd346f44ade1e004ae 100644 (file)
--- a/src/librustc_mir/util/graphviz.rs
+++ b/src/librustc_mir/util/graphviz.rs
@@ -141,7 +141,7 @@ fn write_graph_label<'a, 'gcx, 'tcx, W: Write>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
         )?;
     }
 
-    write!(w, ") -&gt; {}", escape(mir.return_ty()))?;
+    write!(w, ") -&gt; {}", escape(&mir.return_ty()))?;
     write!(w, r#"<br align="left"/>"#)?;
 
     for local in mir.vars_and_temps_iter() {

diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 52514a3ca97d67ab6a8eba9f555c2ff0a46ebcee..c7e63a83b1561155e2acf7822aab4146d222b358 100644 (file)
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -134,7 +134,7 @@ fn visit_ty(&mut self, ty: Ty<'tcx>) -> bool {
             ty::FnDef(def_id, ..) |
             ty::Closure(def_id, ..) |
             ty::Generator(def_id, ..) => {
-                if self.def_id_visitor.visit_def_id(def_id, "type", ty) {
+                if self.def_id_visitor.visit_def_id(def_id, "type", &ty) {
                     return true;
                 }
                 if self.def_id_visitor.shallow() {