diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2014-09-13 19:06:01 +0300 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2014-09-14 03:39:36 +0300 |
| commit | ccd8498afbb371939b7decdbee712f726ccbded3 (patch) | |
| tree | 8939c9dba98ee7a2f624e82c3c72dcf33576d350 /src/libsyntax/parse/token.rs | |
| parent | d6fb338d01864e3801cab9f76d608f204d11fc27 (diff) | |
| download | rust-ccd8498afbb371939b7decdbee712f726ccbded3.tar.gz rust-ccd8498afbb371939b7decdbee712f726ccbded3.zip | |
syntax: fix fallout from using ptr::P.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index cce14be1ba5..f113e0e6cff 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -9,15 +9,15 @@ // except according to those terms. use ast; -use ast::{P, Ident, Name, Mrk}; +use ast::{Ident, Name, Mrk}; use ext::mtwt; use parse::token; +use ptr::P; use util::interner::{RcStr, StrInterner}; use util::interner; use serialize::{Decodable, Decoder, Encodable, Encoder}; use std::fmt; -use std::gc::Gc; use std::mem; use std::path::BytesContainer; use std::rc::Rc; @@ -115,19 +115,19 @@ pub enum Token { #[deriving(Clone, Encodable, Decodable, PartialEq, Eq, Hash)] /// For interpolation during macro expansion. pub enum Nonterminal { - NtItem(Gc<ast::Item>), + NtItem( P<ast::Item>), NtBlock(P<ast::Block>), - NtStmt(Gc<ast::Stmt>), - NtPat( Gc<ast::Pat>), - NtExpr(Gc<ast::Expr>), - NtTy( P<ast::Ty>), + NtStmt( P<ast::Stmt>), + NtPat( P<ast::Pat>), + NtExpr( P<ast::Expr>), + NtTy( P<ast::Ty>), /// See IDENT, above, for meaning of bool in NtIdent: NtIdent(Box<Ident>, bool), /// Stuff inside brackets for attributes - NtMeta(Gc<ast::MetaItem>), + NtMeta( P<ast::MetaItem>), NtPath(Box<ast::Path>), - NtTT( Gc<ast::TokenTree>), // needs Gc'd to break a circularity - NtMatchers(Vec<ast::Matcher> ) + NtTT( P<ast::TokenTree>), // needs P'ed to break a circularity + NtMatchers(Vec<ast::Matcher>) } impl fmt::Show for Nonterminal { |
