Pretty-print `$crate::foo::bar` as `::foo::bar`.

diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
index de4047df81c5d6b60f428eb3bddfe519f207a13b..100e344d9418036af1b7790a2a2b9bbc8ba5d285 100644 (file)
--- a/src/librustc/hir/print.rs
+++ b/src/librustc/hir/print.rs
@@ -1647,7 +1647,7 @@ fn print_path(&mut self,
             if i > 0 {
                 word(&mut self.s, "::")?
             }
-            if segment.name != keywords::CrateRoot.name() {
+            if segment.name != keywords::CrateRoot.name() && segment.name != "$crate" {
                 self.print_name(segment.name)?;
                 self.print_path_parameters(&segment.parameters, colons_before_params)?;
             }
@@ -1674,7 +1674,7 @@ fn print_qpath(&mut self,
                     if i > 0 {
                         word(&mut self.s, "::")?
                     }
-                    if segment.name != keywords::CrateRoot.name() {
+                    if segment.name != keywords::CrateRoot.name() && segment.name != "$crate" {
                         self.print_name(segment.name)?;
                         self.print_path_parameters(&segment.parameters, colons_before_params)?;
                     }

diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index e9c1cbcba61db9953bab3135bd9349222f4b53e8..7558f0256da18986c1897fa021431e15fe90af79 100644 (file)
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -2351,7 +2351,8 @@ fn print_path(&mut self,
             if i > 0 {
                 try!(word(&mut self.s, "::"))
             }
-            if segment.identifier.name != keywords::CrateRoot.name() {
+            if segment.identifier.name != keywords::CrateRoot.name() &&
+               segment.identifier.name != "$crate" {
                 try!(self.print_ident(segment.identifier));
                 if let Some(ref parameters) = segment.parameters {
                     try!(self.print_path_parameters(parameters, colons_before_params));

diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp
index fdb7f9c68b99db54189764c305f92df4223d482e..6c74e7758c4ab113d63f5d1d4b691a3bba7f0c99 100644 (file)
--- a/src/test/pretty/issue-4264.pp
+++ b/src/test/pretty/issue-4264.pp
@@ -39,7 +39,7 @@ pub fn bar() ({
 
 
 
-                  (($crate::fmt::format as
+                  ((::fmt::format as
                        fn(std::fmt::Arguments<'_>) -> std::string::String {std::fmt::format})(((<::std::fmt::Arguments>::new_v1
                                                                                                    as
                                                                                                    fn(&[&str], &[std::fmt::ArgumentV1<'_>]) -> std::fmt::Arguments<'_> {std::fmt::Arguments<'_>::new_v1})(({