mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-12-21 05:31:07 +00:00
parent f10f50b426
commit 8a1acb2c69
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/hir/print.rs
View file

@ -1647,7 +1647,7 @@ impl<'a> State<'a> {
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 @@ impl<'a> State<'a> {
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)?;
}

3
src/libsyntax/print/pprust.rs
View file

@ -2351,7 +2351,8 @@ impl<'a> State<'a> {
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));

2
src/test/pretty/issue-4264.pp
View file

@ -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})(({