Skip to content

Commit f406ef4

Browse files
committed
---
yaml --- r: 123680 b: refs/heads/try c: 728b269 h: refs/heads/master v: v3
1 parent 7309e87 commit f406ef4

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: da4e4e4e0a7778a85748aa4a303b13f603e96b4b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 8ddd286ea4ba4384a0dc9eae393ed515460a986e
5-
refs/heads/try: 29b3f2982007daf1c744254314f38f43145e2cd6
5+
refs/heads/try: 728b269199484f50779c44bad495cc5ddecd4a15
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/parse/token.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -365,10 +365,6 @@ pub fn is_plain_ident(t: &Token) -> bool {
365365
match *t { IDENT(_, false) => true, _ => false }
366366
}
367367

368-
pub fn is_bar(t: &Token) -> bool {
369-
match *t { BINOP(OR) | OROR => true, _ => false }
370-
}
371-
372368
// Get the first "argument"
373369
macro_rules! first {
374370
( $first:expr, $( $remainder:expr, )* ) => ( $first )
@@ -447,7 +443,7 @@ macro_rules! declare_special_idents_and_keywords {(
447443
}}
448444

449445
// If the special idents get renumbered, remember to modify these two as appropriate
450-
static SELF_KEYWORD_NAME: Name = 1;
446+
pub static SELF_KEYWORD_NAME: Name = 1;
451447
static STATIC_KEYWORD_NAME: Name = 2;
452448

453449
// NB: leaving holes in the ident table is bad! a different ident will get

0 commit comments

Comments
 (0)