Skip to content

Commit 1b76bac

Browse files
BleiBlei
committed
syntax: Remove unused tokens
TyDesc, TyVisitor and intrinsic are not used anymore.
1 parent 976c0b3 commit 1b76bac

File tree

1 file changed

+99
-105
lines changed

1 file changed

+99
-105
lines changed

‎src/libsyntax/parse/token.rs

Lines changed: 99 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -331,21 +331,18 @@ pub mod special_idents {
331331
pub static str : ident = ident { name: 19, ctxt: 0}; // for the type
332332

333333
/* outside of libsyntax */
334-
pub static ty_visitor : ident = ident { name: 20, ctxt: 0};
335-
pub static arg : ident = ident { name: 21, ctxt: 0};
336-
pub static descrim : ident = ident { name: 22, ctxt: 0};
337-
pub static clownshoe_abi : ident = ident { name: 23, ctxt: 0};
338-
pub static clownshoe_stack_shim : ident = ident { name: 24, ctxt: 0};
339-
pub static tydesc : ident = ident { name: 25, ctxt: 0};
340-
pub static main : ident = ident { name: 26, ctxt: 0};
341-
pub static opaque : ident = ident { name: 27, ctxt: 0};
342-
pub static blk : ident = ident { name: 28, ctxt: 0};
343-
pub static statik : ident = ident { name: 29, ctxt: 0};
344-
pub static intrinsic : ident = ident { name: 30, ctxt: 0};
345-
pub static clownshoes_foreign_mod: ident = ident { name: 31, ctxt: 0};
346-
pub static unnamed_field: ident = ident { name: 32, ctxt: 0};
347-
pub static c_abi: ident = ident { name: 33, ctxt: 0};
348-
pub static type_self: ident = ident { name: 34, ctxt: 0}; // `Self`
334+
pub static arg : ident = ident { name: 20, ctxt: 0};
335+
pub static descrim : ident = ident { name: 21, ctxt: 0};
336+
pub static clownshoe_abi : ident = ident { name: 22, ctxt: 0};
337+
pub static clownshoe_stack_shim : ident = ident { name: 23, ctxt: 0};
338+
pub static main : ident = ident { name: 24, ctxt: 0};
339+
pub static opaque : ident = ident { name: 25, ctxt: 0};
340+
pub static blk : ident = ident { name: 26, ctxt: 0};
341+
pub static statik : ident = ident { name: 27, ctxt: 0};
342+
pub static clownshoes_foreign_mod: ident = ident { name: 28, ctxt: 0};
343+
pub static unnamed_field: ident = ident { name: 29, ctxt: 0};
344+
pub static c_abi: ident = ident { name: 30, ctxt: 0};
345+
pub static type_self: ident = ident { name: 31, ctxt: 0}; // `Self`
349346
}
350347

351348
/**
@@ -426,59 +423,56 @@ fn mk_fresh_ident_interner() -> @ident_interner {
426423
"tt", // 17
427424
"matchers", // 18
428425
"str", // 19
429-
"TyVisitor", // 20
430-
"arg", // 21
431-
"descrim", // 22
432-
"__rust_abi", // 23
433-
"__rust_stack_shim", // 24
434-
"TyDesc", // 25
435-
"main", // 26
436-
"<opaque>", // 27
437-
"blk", // 28
438-
"static", // 29
439-
"intrinsic", // 30
440-
"__foreign_mod__", // 31
441-
"__field__", // 32
442-
"C", // 33
443-
"Self", // 34
444-
445-
"as", // 35
446-
"break", // 36
447-
"const", // 37
448-
"copy", // 38
449-
"do", // 39
450-
"else", // 40
451-
"enum", // 41
452-
"extern", // 42
453-
"false", // 43
454-
"fn", // 44
455-
"for", // 45
456-
"if", // 46
457-
"impl", // 47
458-
"let", // 48
459-
"__log", // 49
460-
"loop", // 50
461-
"match", // 51
462-
"mod", // 52
463-
"mut", // 53
464-
"once", // 54
465-
"priv", // 55
466-
"pub", // 56
467-
"pure", // 57
468-
"ref", // 58
469-
"return", // 59
470-
"static", // 29 -- also a special ident
426+
"arg", // 20
427+
"descrim", // 21
428+
"__rust_abi", // 22
429+
"__rust_stack_shim", // 23
430+
"main", // 24
431+
"<opaque>", // 25
432+
"blk", // 26
433+
"static", // 27
434+
"__foreign_mod__", // 28
435+
"__field__", // 29
436+
"C", // 30
437+
"Self", // 31
438+
439+
"as", // 32
440+
"break", // 33
441+
"const", // 34
442+
"copy", // 35
443+
"do", // 36
444+
"else", // 37
445+
"enum", // 38
446+
"extern", // 39
447+
"false", // 40
448+
"fn", // 41
449+
"for", // 42
450+
"if", // 43
451+
"impl", // 44
452+
"let", // 45
453+
"__log", // 46
454+
"loop", // 47
455+
"match", // 48
456+
"mod", // 49
457+
"mut", // 50
458+
"once", // 51
459+
"priv", // 52
460+
"pub", // 53
461+
"pure", // 54
462+
"ref", // 55
463+
"return", // 56
464+
"static", // 27 -- also a special ident
471465
"self", // 8 -- also a special ident
472-
"struct", // 60
473-
"super", // 61
474-
"true", // 62
475-
"trait", // 63
476-
"type", // 64
477-
"unsafe", // 65
478-
"use", // 66
479-
"while", // 67
480-
481-
"be", // 68
466+
"struct", // 57
467+
"super", // 58
468+
"true", // 59
469+
"trait", // 60
470+
"type", // 61
471+
"unsafe", // 62
472+
"use", // 63
473+
"while", // 64
474+
475+
"be", // 65
482476
];
483477

484478
@ident_interner {
@@ -612,42 +606,42 @@ pub mod keywords {
612606
impl Keyword {
613607
pub fn to_ident(&self) -> ident {
614608
match *self {
615-
As => ident { name: 35, ctxt: 0 },
616-
Break => ident { name: 36, ctxt: 0 },
617-
Const => ident { name: 37, ctxt: 0 },
618-
Copy => ident { name: 38, ctxt: 0 },
619-
Do => ident { name: 39, ctxt: 0 },
620-
Else => ident { name: 40, ctxt: 0 },
621-
Enum => ident { name: 41, ctxt: 0 },
622-
Extern => ident { name: 42, ctxt: 0 },
623-
False => ident { name: 43, ctxt: 0 },
624-
Fn => ident { name: 44, ctxt: 0 },
625-
For => ident { name: 45, ctxt: 0 },
626-
If => ident { name: 46, ctxt: 0 },
627-
Impl => ident { name: 47, ctxt: 0 },
628-
Let => ident { name: 48, ctxt: 0 },
629-
__Log => ident { name: 49, ctxt: 0 },
630-
Loop => ident { name: 50, ctxt: 0 },
631-
Match => ident { name: 51, ctxt: 0 },
632-
Mod => ident { name: 52, ctxt: 0 },
633-
Mut => ident { name: 53, ctxt: 0 },
634-
Once => ident { name: 54, ctxt: 0 },
635-
Priv => ident { name: 55, ctxt: 0 },
636-
Pub => ident { name: 56, ctxt: 0 },
637-
Pure => ident { name: 57, ctxt: 0 },
638-
Ref => ident { name: 58, ctxt: 0 },
639-
Return => ident { name: 59, ctxt: 0 },
640-
Static => ident { name: 29, ctxt: 0 },
609+
As => ident { name: 32, ctxt: 0 },
610+
Break => ident { name: 33, ctxt: 0 },
611+
Const => ident { name: 34, ctxt: 0 },
612+
Copy => ident { name: 35, ctxt: 0 },
613+
Do => ident { name: 36, ctxt: 0 },
614+
Else => ident { name: 37, ctxt: 0 },
615+
Enum => ident { name: 38, ctxt: 0 },
616+
Extern => ident { name: 39, ctxt: 0 },
617+
False => ident { name: 40, ctxt: 0 },
618+
Fn => ident { name: 41, ctxt: 0 },
619+
For => ident { name: 42, ctxt: 0 },
620+
If => ident { name: 43, ctxt: 0 },
621+
Impl => ident { name: 44, ctxt: 0 },
622+
Let => ident { name: 45, ctxt: 0 },
623+
__Log => ident { name: 46, ctxt: 0 },
624+
Loop => ident { name: 47, ctxt: 0 },
625+
Match => ident { name: 48, ctxt: 0 },
626+
Mod => ident { name: 49, ctxt: 0 },
627+
Mut => ident { name: 50, ctxt: 0 },
628+
Once => ident { name: 51, ctxt: 0 },
629+
Priv => ident { name: 52, ctxt: 0 },
630+
Pub => ident { name: 53, ctxt: 0 },
631+
Pure => ident { name: 54, ctxt: 0 },
632+
Ref => ident { name: 55, ctxt: 0 },
633+
Return => ident { name: 56, ctxt: 0 },
634+
Static => ident { name: 27, ctxt: 0 },
641635
Self => ident { name: 8, ctxt: 0 },
642-
Struct => ident { name: 60, ctxt: 0 },
643-
Super => ident { name: 61, ctxt: 0 },
644-
True => ident { name: 62, ctxt: 0 },
645-
Trait => ident { name: 63, ctxt: 0 },
646-
Type => ident { name: 64, ctxt: 0 },
647-
Unsafe => ident { name: 65, ctxt: 0 },
648-
Use => ident { name: 66, ctxt: 0 },
649-
While => ident { name: 67, ctxt: 0 },
650-
Be => ident { name: 68, ctxt: 0 },
636+
Struct => ident { name: 57, ctxt: 0 },
637+
Super => ident { name: 58, ctxt: 0 },
638+
True => ident { name: 59, ctxt: 0 },
639+
Trait => ident { name: 60, ctxt: 0 },
640+
Type => ident { name: 61, ctxt: 0 },
641+
Unsafe => ident { name: 62, ctxt: 0 },
642+
Use => ident { name: 63, ctxt: 0 },
643+
While => ident { name: 64, ctxt: 0 },
644+
Be => ident { name: 65, ctxt: 0 },
651645
}
652646
}
653647
}
@@ -663,7 +657,7 @@ pub fn is_keyword(kw: keywords::Keyword, tok: &Token) -> bool {
663657
pub fn is_any_keyword(tok: &Token) -> bool {
664658
match *tok {
665659
token::IDENT(sid, false) => match sid.name {
666-
8 | 29 | 35 .. 68 => true,
660+
8 | 27 | 32 .. 65 => true,
667661
_ => false,
668662
},
669663
_ => false
@@ -673,7 +667,7 @@ pub fn is_any_keyword(tok: &Token) -> bool {
673667
pub fn is_strict_keyword(tok: &Token) -> bool {
674668
match *tok {
675669
token::IDENT(sid, false) => match sid.name {
676-
8 | 29 | 35 .. 67 => true,
670+
8 | 27 | 32 .. 64 => true,
677671
_ => false,
678672
},
679673
_ => false,
@@ -683,7 +677,7 @@ pub fn is_strict_keyword(tok: &Token) -> bool {
683677
pub fn is_reserved_keyword(tok: &Token) -> bool {
684678
match *tok {
685679
token::IDENT(sid, false) => match sid.name {
686-
68 => true,
680+
65 => true,
687681
_ => false,
688682
},
689683
_ => false,

0 commit comments

Comments
 (0)