Prefer to use print_def_path

JohnTitor · JohnTitor · commit 6fdd53b7de6b · 2020-10-22T14:40:09.000+09:00
diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs
@@ -658,7 +658,7 @@ pub trait PrettyPrinter<'tcx>:
                         let span = self.tcx().hir().span(hir_id);
                         p!(write("@{}", self.tcx().sess.source_map().span_to_string(span)));
                     } else {
-                        p!(write("@{}", self.tcx().def_path_str(did)));
+                        p!(write("@"), print_def_path(did, substs));
                     }
                 } else {
                     p!(print_def_path(did, substs));
@@ -694,7 +694,7 @@ pub trait PrettyPrinter<'tcx>:
                             p!(write("@{}", self.tcx().sess.source_map().span_to_string(span)));
                         }
                     } else {
-                        p!(write("@{}", self.tcx().def_path_str(did)));
+                        p!(write("@"), print_def_path(did, substs));
                     }
                 } else {
                     p!(print_def_path(did, substs));

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ pub trait PrettyPrinter<'tcx>:`
`658`	`658`	`let span = self.tcx().hir().span(hir_id);`
`659`	`659`	`p!(write("@{}", self.tcx().sess.source_map().span_to_string(span)));`
`660`	`660`	`} else {`
`661`		`- p!(write("@{}", self.tcx().def_path_str(did)));`
	`661`	`+ p!(write("@"), print_def_path(did, substs));`
`662`	`662`	`}`
`663`	`663`	`} else {`
`664`	`664`	`p!(print_def_path(did, substs));`
`@@ -694,7 +694,7 @@ pub trait PrettyPrinter<'tcx>:`
`694`	`694`	`p!(write("@{}", self.tcx().sess.source_map().span_to_string(span)));`
`695`	`695`	`}`
`696`	`696`	`} else {`
`697`		`- p!(write("@{}", self.tcx().def_path_str(did)));`
	`697`	`+ p!(write("@"), print_def_path(did, substs));`
`698`	`698`	`}`
`699`	`699`	`} else {`
`700`	`700`	`p!(print_def_path(did, substs));`