diff options
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 7 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/ty.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax_ext/format.rs | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index b117b383120..a3e70cc6321 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -201,8 +201,7 @@ use syntax::codemap::{self, DUMMY_SP}; use syntax::codemap::Span; use syntax::errors::Handler; use syntax::util::move_map::MoveMap; -use syntax::parse::token::{intern, InternedString}; -use syntax::parse::token::{keywords, special_idents}; +use syntax::parse::token::{intern, keywords, InternedString}; use syntax::ptr::P; use self::ty::{LifetimeBounds, Path, Ptr, PtrTy, Self_, Ty}; @@ -635,7 +634,7 @@ impl<'a> TraitDef<'a> { cx.item( self.span, - special_idents::Invalid, + keywords::Invalid.ident(), a, ast::ItemKind::Impl(unsafety, ast::ImplPolarity::Positive, @@ -866,7 +865,7 @@ impl<'a> MethodDef<'a> { // creating fresh self id _ => Some(ast::Arg::new_self(trait_.span, ast::Mutability::Immutable, - keywords::SelfValue.ident)) + keywords::SelfValue.ident())) }; let args = { let args = arg_types.into_iter().map(|(name, ty)| { diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index 972983c2538..e19febe2a12 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -264,7 +264,7 @@ pub fn get_explicit_self(cx: &ExtCtxt, span: Span, self_ptr: &Option<PtrTy>) let self_path = cx.expr_self(span); match *self_ptr { None => { - (self_path, respan(span, ast::SelfKind::Value(keywords::SelfValue.ident))) + (self_path, respan(span, ast::SelfKind::Value(keywords::SelfValue.ident()))) } Some(ref ptr) => { let self_ty = respan( @@ -272,7 +272,7 @@ pub fn get_explicit_self(cx: &ExtCtxt, span: Span, self_ptr: &Option<PtrTy>) match *ptr { Borrowed(ref lt, mutbl) => { let lt = lt.map(|s| cx.lifetime(span, cx.ident_of(s).name)); - ast::SelfKind::Region(lt, mutbl, keywords::SelfValue.ident) + ast::SelfKind::Region(lt, mutbl, keywords::SelfValue.ident()) } Raw(_) => cx.span_bug(span, "attempted to use *self in deriving definition") }); diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 828f4a72e1f..6c61d6b914c 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -19,8 +19,7 @@ use syntax::ext::base::*; use syntax::ext::base; use syntax::ext::build::AstBuilder; use syntax::fold::Folder; -use syntax::parse::token::special_idents; -use syntax::parse::token; +use syntax::parse::token::{self, keywords}; use syntax::ptr::P; use std::collections::HashMap; @@ -449,7 +448,7 @@ impl<'a, 'b> Context<'a, 'b> { let sp = piece_ty.span; let ty = ecx.ty_rptr(sp, ecx.ty(sp, ast::TyKind::Vec(piece_ty)), - Some(ecx.lifetime(sp, special_idents::StaticLifetime.name)), + Some(ecx.lifetime(sp, keywords::StaticLifetime.name())), ast::Mutability::Immutable); let slice = ecx.expr_vec_slice(sp, pieces); // static instead of const to speed up codegen by not requiring this to be inlined @@ -475,7 +474,7 @@ impl<'a, 'b> Context<'a, 'b> { // First, build up the static array which will become our precompiled // format "string" - let static_lifetime = self.ecx.lifetime(self.fmtsp, special_idents::StaticLifetime.name); + let static_lifetime = self.ecx.lifetime(self.fmtsp, keywords::StaticLifetime.name()); let piece_ty = self.ecx.ty_rptr( self.fmtsp, self.ecx.ty_ident(self.fmtsp, self.ecx.ident_of("str")), |