From 4f69b7fb850cae83ea3d5adfeb8520418c976403 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Thu, 5 Apr 2018 03:20:21 +0300 Subject: Avoid comparing fields by name when possible Resolve them into field indices once and then use those resolutions + Fix rebase --- src/libsyntax/ext/build.rs | 4 ++-- src/libsyntax/parse/parser.rs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 2e1a4ee5851..36244f0a3c4 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -636,8 +636,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> { self.expr(sp, ast::ExprKind::Field(expr, ident.with_span_pos(sp))) } fn expr_tup_field_access(&self, sp: Span, expr: P, idx: usize) -> P { - let id = Spanned { node: Ident::from_str(&idx.to_string()), span: sp }; - self.expr(sp, ast::ExprKind::Field(expr, id)) + let ident = Ident::from_str(&idx.to_string()).with_span_pos(sp); + self.expr(sp, ast::ExprKind::Field(expr, ident)) } fn expr_addr_of(&self, sp: Span, e: P) -> P { self.expr(sp, ast::ExprKind::AddrOf(ast::Mutability::Immutable, e)) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 33a602a26fc..a7a9ce74512 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2604,8 +2604,7 @@ impl<'a> Parser<'a> { token::Literal(token::Integer(name), _) => { let span = self.span; self.bump(); - let ident = Ident { name, ctxt: span.ctxt() }; - let field = ExprKind::Field(e, respan(span, ident)); + let field = ExprKind::Field(e, Ident::new(name, span)); e = self.mk_expr(lo.to(span), field, ThinVec::new()); } token::Literal(token::Float(n), _suf) => { @@ -7031,7 +7030,7 @@ impl<'a> Parser<'a> { match self.token { token::Ident(ident, false) if ident.name == keywords::Underscore.name() => { self.bump(); // `_` - Ok(Some(Ident { name: ident.name.gensymed(), ..ident })) + Ok(Some(Ident::new(ident.name.gensymed(), ident.span))) } _ => self.parse_ident().map(Some), } -- cgit 1.4.1-3-g733a5