about summary refs log tree commit diff
path: root/src/libsyntax/print
diff options
context:
space:
mode:
authorMichael Hewson <mah957@gmail.com>2017-05-10 00:30:47 +0000
committerMatt Peterson <ricochet1k@gmail.com>2017-12-28 11:32:05 -0500
commit03a51019a40c1c5e2ab1635f993fc71517d1edc2 (patch)
tree52fac58e67c2c60241f61b61519881a1ebe817f6 /src/libsyntax/print
parent4352c11dd0975679e25130fa2ba2d563c43edd79 (diff)
downloadrust-03a51019a40c1c5e2ab1635f993fc71517d1edc2.tar.gz
rust-03a51019a40c1c5e2ab1635f993fc71517d1edc2.zip
Resurrecting #33135
Started rebasing @sgrif's PR #33135 off of current master. (Well, actually merging it into a new branch based off current master.)

The following files still need to be fixed or at least reviewed:

- `src/libsyntax/ext/tt/macro_parser.rs`: calls `Parser::parse_lifetime`, which doesn't exist anymore
- `src/libsyntax/parse/parser.rs`: @sgrif added an error message to `Parser::parse_lifetime`. Code has since been refactored, so I just took it out for now.
- `src/libsyntax/ext/tt/transcribe.rs`: This code has been refactored bigtime. Not sure whether @sgrif's changes here are still necessary. Took it out for this commit.
Diffstat (limited to 'src/libsyntax/print')
-rw-r--r--src/libsyntax/print/pprust.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 8f619e8af76..dd343a2384b 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -279,6 +279,7 @@ pub fn token_to_string(tok: &Token) -> String {
             token::NtWhereClause(ref e) => where_clause_to_string(e),
             token::NtArg(ref e)         => arg_to_string(e),
             token::NtVis(ref e)         => vis_to_string(e),
+            token::NtLifetime(ref e)    => lifetime_to_string(e),
         }
     }
 }