X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgrammar%2Fverify.rs;h=b7714a7e3c5dd96ec94ec4c2e9e86f2310d2d247;hb=1181ca4b515cc7bb68ab62f99999d06c0e6f763a;hp=6709479b2b5b2d2352a971c64d781182b7e2ec9f;hpb=fd10ded4eaf49adf29f61fc5c52932ff74552dd9;p=rust.git diff --git a/src/grammar/verify.rs b/src/grammar/verify.rs index 6709479b2b5..b7714a7e3c5 100644 --- a/src/grammar/verify.rs +++ b/src/grammar/verify.rs @@ -35,7 +35,7 @@ fn parse_token_list(file: &str) -> HashMap { fn id() -> token::Token { - token::Ident(ast::Ident { name: Name(0), ctxt: 0, }, token::Plain) + token::Ident(ast::Ident::with_empty_ctxt(Name(0))), token::Plain) } let mut res = HashMap::new(); @@ -75,7 +75,7 @@ fn id() -> token::Token { "RPAREN" => token::CloseDelim(token::Paren), "SLASH" => token::BinOp(token::Slash), "COMMA" => token::Comma, - "LIFETIME" => token::Lifetime(ast::Ident { name: Name(0), ctxt: 0 }), + "LIFETIME" => token::Lifetime(ast::Ident::with_empty_ctxt(Name(0))), "CARET" => token::BinOp(token::Caret), "TILDE" => token::Tilde, "IDENT" => id(), @@ -208,9 +208,9 @@ fn parse_antlr_token(s: &str, tokens: &HashMap, surrogate_ token::Literal(token::ByteStr(..), n) => token::Literal(token::ByteStr(nm), n), token::Literal(token::ByteStrRaw(..), n) => token::Literal(token::ByteStrRaw(fix(content), count(content)), n), - token::Ident(..) => token::Ident(ast::Ident { name: nm, ctxt: 0 }, + token::Ident(..) => token::Ident(ast::Ident::with_empty_ctxt(nm)), token::ModName), - token::Lifetime(..) => token::Lifetime(ast::Ident { name: nm, ctxt: 0 }), + token::Lifetime(..) => token::Lifetime(ast::Ident::with_empty_ctxt(nm)), ref t => t.clone() };