diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-11-02 11:07:23 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-11-02 11:07:23 +0800 |
| commit | 1d02810c3cf908bfba7c15ae50eb5314603b9d85 (patch) | |
| tree | 79dd5e4ef4c3ff79db0912ba546f08e61a7a8c10 /src/parse/tokenstream.cpp | |
| parent | 7111acba04d72fe4084b1a1f3209ff83efe8614d (diff) | |
| parent | 8b53b38f40625ab0510f541d69db3f83332a830a (diff) | |
| download | mrust-1d02810c3cf908bfba7c15ae50eb5314603b9d85.tar.gz | |
Merge branch 'nightly-1.29' - #95 Working support for rustc 1.29
Diffstat (limited to 'src/parse/tokenstream.cpp')
| -rw-r--r-- | src/parse/tokenstream.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parse/tokenstream.cpp b/src/parse/tokenstream.cpp index 889c626c..6f0c57a1 100644 --- a/src/parse/tokenstream.cpp +++ b/src/parse/tokenstream.cpp @@ -138,11 +138,11 @@ Span TokenStream::point_span() const Ident TokenStream::get_ident(Token tok) const { if(tok.type() == TOK_IDENT) { - return Ident(getHygiene(), tok.str()); + return Ident(getHygiene(), tok.istr()); } else if(tok.type() == TOK_LIFETIME) { // TODO: Maybe only when it's explicitly asked for? - return Ident(getHygiene(), tok.str()); + return Ident(getHygiene(), tok.istr()); } else if( tok.type() == TOK_INTERPOLATED_IDENT ) { TODO(getPosition(), "get_ident from TOK_INTERPOLATED_IDENT"); |