Skip to content

Commit 7f1df7b

Browse files
committed
---
yaml --- r: 123425 b: refs/heads/auto c: 728b269 h: refs/heads/master i: 123423: eb93b7e v: v3
1 parent a1e13ed commit 7f1df7b

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 29b3f2982007daf1c744254314f38f43145e2cd6
16+
refs/heads/auto: 728b269199484f50779c44bad495cc5ddecd4a15
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)