File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ fn item(p: &mut Parser) {
14
14
let item = p. start ( ) ;
15
15
attributes:: outer_attributes ( p) ;
16
16
visibility ( p) ;
17
- let la = p. raw_lookahead ( 1 ) ;
17
+ let la = p. nth ( 1 ) ;
18
18
let item_kind = match p. current ( ) {
19
19
EXTERN_KW if la == CRATE_KW => {
20
20
extern_crate_item ( p) ;
@@ -171,7 +171,7 @@ fn use_item(p: &mut Parser) {
171
171
p. expect ( SEMI ) ;
172
172
173
173
fn use_tree ( p : & mut Parser ) {
174
- let la = p. raw_lookahead ( 1 ) ;
174
+ let la = p. nth ( 1 ) ;
175
175
let m = p. start ( ) ;
176
176
match ( p. current ( ) , la) {
177
177
( STAR , _) => {
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ fn visibility(p: &mut Parser) {
20
20
let vis = p. start ( ) ;
21
21
p. bump ( ) ;
22
22
if p. at ( L_PAREN ) {
23
- match p. raw_lookahead ( 1 ) {
23
+ match p. nth ( 1 ) {
24
24
CRATE_KW | SELF_KW | SUPER_KW | IN_KW => {
25
25
p. bump ( ) ;
26
26
if p. bump ( ) == IN_KW {
@@ -87,13 +87,13 @@ impl Lookahead for SyntaxKind {
87
87
88
88
impl Lookahead for [ SyntaxKind ; 2 ] {
89
89
fn is_ahead ( self , p : & Parser ) -> bool {
90
- p. current ( ) == self [ 0 ] && p. raw_lookahead ( 1 ) == self [ 1 ]
90
+ p. current ( ) == self [ 0 ] && p. nth ( 1 ) == self [ 1 ]
91
91
}
92
92
}
93
93
94
94
impl Lookahead for [ SyntaxKind ; 3 ] {
95
95
fn is_ahead ( self , p : & Parser ) -> bool {
96
- p. current ( ) == self [ 0 ] && p. raw_lookahead ( 1 ) == self [ 1 ] && p. raw_lookahead ( 2 ) == self [ 2 ]
96
+ p. current ( ) == self [ 0 ] && p. nth ( 1 ) == self [ 1 ] && p. nth ( 2 ) == self [ 2 ]
97
97
}
98
98
}
99
99
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ pub(crate) fn use_path(p: &mut Parser) {
12
12
path_segment ( p, true ) ;
13
13
let mut qual = path. complete ( p, PATH ) ;
14
14
loop {
15
- if p. at ( COLONCOLON ) && !items:: is_use_tree_start ( p. raw_lookahead ( 1 ) ) {
15
+ if p. at ( COLONCOLON ) && !items:: is_use_tree_start ( p. nth ( 1 ) ) {
16
16
let path = qual. precede ( p) ;
17
17
p. bump ( ) ;
18
18
path_segment ( p, false ) ;
Original file line number Diff line number Diff line change @@ -164,12 +164,12 @@ impl<'t> Parser<'t> {
164
164
kind
165
165
}
166
166
167
- pub ( crate ) fn raw_lookahead ( & self , n : usize ) -> SyntaxKind {
167
+ pub ( crate ) fn nth ( & self , n : usize ) -> SyntaxKind {
168
168
self . tokens . get ( self . pos + n) . map ( |t| t. kind ) . unwrap_or ( EOF )
169
169
}
170
170
171
171
pub ( crate ) fn current ( & self ) -> SyntaxKind {
172
- self . raw_lookahead ( 0 )
172
+ self . nth ( 0 )
173
173
}
174
174
175
175
fn event ( & mut self , event : Event ) {
You can’t perform that action at this time.
0 commit comments