rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into proc_macro_api

Browse Source
This commit is contained in:
Alex Crichton
2017-07-05 08:42:13 -07:00
parent d316874c87 692b572236
commit fd95db25b3
605 changed files with 6469 additions and 3681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsyntax/print/pprust.rs
View File

@@ -760,7 +760,7 @@ pub trait PrintState<'a> {
word(self.writer(), "::")?
}
if segment.identifier.name != keywords::CrateRoot.name() &&
segment.identifier.name != "$crate" {
segment.identifier.name != keywords::DollarCrate.name() {
word(self.writer(), &segment.identifier.name.as_str())?;
}
}
@@ -2374,7 +2374,7 @@ impl<'a> State<'a> {
-> io::Result<()>
{
if segment.identifier.name != keywords::CrateRoot.name() &&
segment.identifier.name != "$crate" {
segment.identifier.name != keywords::DollarCrate.name() {
self.print_ident(segment.identifier)?;
if let Some(ref parameters) = segment.parameters {
self.print_path_parameters(parameters, colons_before_params)?;