Skip to content

Commit 5fee324

Browse files
erickterickt
committed
syntax: remove parse::token::{dtor,literally_dtor}
1 parent 3e3e2f0 commit 5fee324

File tree

1 file changed

+70
-75
lines changed

1 file changed

+70
-75
lines changed

‎src/libsyntax/parse/token.rs

Lines changed: 70 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -305,50 +305,47 @@ pub fn is_bar(t: &Token) -> bool {
305305
pub mod special_idents {
306306
use ast::ident;
307307
308-
pub static underscore : ident = ident { repr: 0u, ctxt: 0};
309-
pub static anon : ident = ident { repr: 1u, ctxt: 0};
310-
pub static dtor : ident = ident { repr: 2u, ctxt: 0}; // 'drop', but that's
311-
// reserved
312-
pub static invalid : ident = ident { repr: 3u, ctxt: 0}; // ''
313-
pub static unary : ident = ident { repr: 4u, ctxt: 0};
314-
pub static not_fn : ident = ident { repr: 5u, ctxt: 0};
315-
pub static idx_fn : ident = ident { repr: 6u, ctxt: 0};
316-
pub static unary_minus_fn : ident = ident { repr: 7u, ctxt: 0};
317-
pub static clownshoes_extensions : ident = ident { repr: 8u, ctxt: 0};
318-
319-
pub static self_ : ident = ident { repr: 9u, ctxt: 0}; // 'self'
308+
pub static underscore : ident = ident { repr: 0, ctxt: 0};
309+
pub static anon : ident = ident { repr: 1, ctxt: 0};
310+
pub static invalid : ident = ident { repr: 2, ctxt: 0}; // ''
311+
pub static unary : ident = ident { repr: 3, ctxt: 0};
312+
pub static not_fn : ident = ident { repr: 4, ctxt: 0};
313+
pub static idx_fn : ident = ident { repr: 5, ctxt: 0};
314+
pub static unary_minus_fn : ident = ident { repr: 6, ctxt: 0};
315+
pub static clownshoes_extensions : ident = ident { repr: 7, ctxt: 0};
316+
317+
pub static self_ : ident = ident { repr: 8, ctxt: 0}; // 'self'
320318
321319
/* for matcher NTs */
322-
pub static item : ident = ident { repr: 10u, ctxt: 0};
323-
pub static block : ident = ident { repr: 11u, ctxt: 0};
324-
pub static stmt : ident = ident { repr: 12u, ctxt: 0};
325-
pub static pat : ident = ident { repr: 13u, ctxt: 0};
326-
pub static expr : ident = ident { repr: 14u, ctxt: 0};
327-
pub static ty : ident = ident { repr: 15u, ctxt: 0};
328-
pub static ident : ident = ident { repr: 16u, ctxt: 0};
329-
pub static path : ident = ident { repr: 17u, ctxt: 0};
330-
pub static tt : ident = ident { repr: 18u, ctxt: 0};
331-
pub static matchers : ident = ident { repr: 19u, ctxt: 0};
332-
333-
pub static str : ident = ident { repr: 20u, ctxt: 0}; // for the type
320+
pub static item : ident = ident { repr: 9, ctxt: 0};
321+
pub static block : ident = ident { repr: 10, ctxt: 0};
322+
pub static stmt : ident = ident { repr: 11, ctxt: 0};
323+
pub static pat : ident = ident { repr: 12, ctxt: 0};
324+
pub static expr : ident = ident { repr: 13, ctxt: 0};
325+
pub static ty : ident = ident { repr: 14, ctxt: 0};
326+
pub static ident : ident = ident { repr: 15, ctxt: 0};
327+
pub static path : ident = ident { repr: 16, ctxt: 0};
328+
pub static tt : ident = ident { repr: 17, ctxt: 0};
329+
pub static matchers : ident = ident { repr: 18, ctxt: 0};
330+
331+
pub static str : ident = ident { repr: 19, ctxt: 0}; // for the type
334332
335333
/* outside of libsyntax */
336-
pub static ty_visitor : ident = ident { repr: 21u, ctxt: 0};
337-
pub static arg : ident = ident { repr: 22u, ctxt: 0};
338-
pub static descrim : ident = ident { repr: 23u, ctxt: 0};
339-
pub static clownshoe_abi : ident = ident { repr: 24u, ctxt: 0};
340-
pub static clownshoe_stack_shim : ident = ident { repr: 25u, ctxt: 0};
341-
pub static tydesc : ident = ident { repr: 26u, ctxt: 0};
342-
pub static literally_dtor : ident = ident { repr: 27u, ctxt: 0};
343-
pub static main : ident = ident { repr: 28u, ctxt: 0};
344-
pub static opaque : ident = ident { repr: 29u, ctxt: 0};
345-
pub static blk : ident = ident { repr: 30u, ctxt: 0};
346-
pub static static : ident = ident { repr: 31u, ctxt: 0};
347-
pub static intrinsic : ident = ident { repr: 32u, ctxt: 0};
348-
pub static clownshoes_foreign_mod: ident = ident { repr: 33u, ctxt: 0};
349-
pub static unnamed_field: ident = ident { repr: 34u, ctxt: 0};
350-
pub static c_abi: ident = ident { repr: 35u, ctxt: 0};
351-
pub static type_self: ident = ident { repr: 36u, ctxt: 0}; // `Self`
334+
pub static ty_visitor : ident = ident { repr: 20, ctxt: 0};
335+
pub static arg : ident = ident { repr: 21, ctxt: 0};
336+
pub static descrim : ident = ident { repr: 22, ctxt: 0};
337+
pub static clownshoe_abi : ident = ident { repr: 23, ctxt: 0};
338+
pub static clownshoe_stack_shim : ident = ident { repr: 24, ctxt: 0};
339+
pub static tydesc : ident = ident { repr: 25, ctxt: 0};
340+
pub static main : ident = ident { repr: 26, ctxt: 0};
341+
pub static opaque : ident = ident { repr: 27, ctxt: 0};
342+
pub static blk : ident = ident { repr: 28, ctxt: 0};
343+
pub static static : ident = ident { repr: 29, ctxt: 0};
344+
pub static intrinsic : ident = ident { repr: 30, ctxt: 0};
345+
pub static clownshoes_foreign_mod: ident = ident { repr: 31, ctxt: 0};
346+
pub static unnamed_field: ident = ident { repr: 32, ctxt: 0};
347+
pub static c_abi: ident = ident { repr: 33, ctxt: 0};
348+
pub static type_self: ident = ident { repr: 34, ctxt: 0}; // `Self`
352349
}
353350
354351
pub struct StringRef<'self>(&'self str);
@@ -426,41 +423,39 @@ pub fn mk_fresh_ident_interner() -> @ident_interner {
426423
let init_vec = ~[
427424
@~"_", // 0
428425
@~"anon", // 1
429-
@~"drop", // 2
430-
@~"", // 3
431-
@~"unary", // 4
432-
@~"!", // 5
433-
@~"[]", // 6
434-
@~"unary-", // 7
435-
@~"__extensions__", // 8
436-
@~"self", // 9
437-
@~"item", // 10
438-
@~"block", // 11
439-
@~"stmt", // 12
440-
@~"pat", // 13
441-
@~"expr", // 14
442-
@~"ty", // 15
443-
@~"ident", // 16
444-
@~"path", // 17
445-
@~"tt", // 18
446-
@~"matchers", // 19
447-
@~"str", // 20
448-
@~"TyVisitor", // 21
449-
@~"arg", // 22
450-
@~"descrim", // 23
451-
@~"__rust_abi", // 24
452-
@~"__rust_stack_shim", // 25
453-
@~"TyDesc", // 26
454-
@~"dtor", // 27
455-
@~"main", // 28
456-
@~"<opaque>", // 29
457-
@~"blk", // 30
458-
@~"static", // 31
459-
@~"intrinsic", // 32
460-
@~"__foreign_mod__", // 33
461-
@~"__field__", // 34
462-
@~"C", // 35
463-
@~"Self", // 36
426+
@~"", // 2
427+
@~"unary", // 3
428+
@~"!", // 4
429+
@~"[]", // 5
430+
@~"unary-", // 6
431+
@~"__extensions__", // 7
432+
@~"self", // 8
433+
@~"item", // 9
434+
@~"block", // 10
435+
@~"stmt", // 11
436+
@~"pat", // 12
437+
@~"expr", // 13
438+
@~"ty", // 14
439+
@~"ident", // 15
440+
@~"path", // 16
441+
@~"tt", // 17
442+
@~"matchers", // 18
443+
@~"str", // 19
444+
@~"TyVisitor", // 20
445+
@~"arg", // 21
446+
@~"descrim", // 22
447+
@~"__rust_abi", // 23
448+
@~"__rust_stack_shim", // 24
449+
@~"TyDesc", // 25
450+
@~"main", // 26
451+
@~"<opaque>", // 27
452+
@~"blk", // 28
453+
@~"static", // 29
454+
@~"intrinsic", // 30
455+
@~"__foreign_mod__", // 31
456+
@~"__field__", // 32
457+
@~"C", // 33
458+
@~"Self", // 34
464459
];
465460
466461
let rv = @ident_interner {

0 commit comments

Comments
 (0)