rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify use of keyword symbols

Browse Source
This commit is contained in:
Vadim Petrochenkov
2019-05-11 17:41:37 +03:00
parent 37ff5d388f
commit 59a382122f
58 changed files with 502 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax_ext/deriving/generic/mod.rs
View File

@@ -191,7 +191,7 @@ use syntax::ext::build::AstBuilder;
use syntax::source_map::{self, respan};
use syntax::util::map_in_place::MapInPlace;
use syntax::ptr::P;
use syntax::symbol::{Symbol, keywords, sym};
use syntax::symbol::{Symbol, kw, sym};
use syntax::parse::ParseSess;
use syntax_pos::{DUMMY_SP, Span};
@@ -686,7 +686,7 @@ impl<'a> TraitDef<'a> {
};
cx.item(self.span,
keywords::Invalid.ident(),
Ident::with_empty_ctxt(kw::Invalid),
a,
ast::ItemKind::Impl(unsafety,
ast::ImplPolarity::Positive,
@@ -929,8 +929,8 @@ impl<'a> MethodDef<'a> {
let args = {
let self_args = explicit_self.map(|explicit_self| {
ast::Arg::from_self(explicit_self,
keywords::SelfLower.ident().with_span_pos(trait_.span))
let ident = Ident::with_empty_ctxt(kw::SelfLower).with_span_pos(trait_.span);
ast::Arg::from_self(explicit_self, ident)
});
let nonself_args = arg_types.into_iter()
.map(|(name, ty)| cx.arg(trait_.span, name, ty));