Merge branch 'master' of https://github.com/thepowersgang/mrustc

1 files changed, 5 insertions, 1 deletions

diff --git a/src/parse/tokenstream.cpp b/src/parse/tokenstream.cpp
index 901312a3..611df2ff 100644
--- a/src/parse/tokenstream.cpp
+++ b/src/parse/tokenstream.cpp
@@ -140,8 +140,12 @@ Ident TokenStream::get_ident(Token tok) const
     if(tok.type() == TOK_IDENT) {
         return Ident(getHygiene(), tok.str());
     }
+    else if(tok.type() == TOK_LIFETIME) {
+        // TODO: Maybe only when it's explicitly asked for?
+        return Ident(getHygiene(), tok.str());
+    }
     else if( tok.type() == TOK_INTERPOLATED_IDENT ) {
-        TODO(getPosition(), "");
+        TODO(getPosition(), "get_ident from TOK_INTERPOLATED_IDENT");
     }
     else {
         throw ParseError::Unexpected(*this, tok);