user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #1070

Browse source 
1070: Support extern_crate_self r=matklad a=memoryruins

closes #1069

Co-authored-by: memoryruins <memoryruinsmusic@gmail.com>
This commit is contained in:
bors[bot] 2019-03-28 16:19:56 +00:00
commit 2a770190b0
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_parser/src/grammar.rs
View file

@ -184,6 +184,10 @@ fn name_ref(p: &mut Parser) {
let m = p.start();
p.bump();
m.complete(p, NAME_REF);
} else if p.at(SELF_KW) {
let m = p.start();
p.bump();
m.complete(p, SELF_KW);
} else {
p.err_and_bump("expected identifier");
}

1
crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.rs
View file

@ -1,2 +1,3 @@
extern crate foo;
extern crate foo as bar;
extern crate self as baz;

17
crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.txt
View file

@ -1,4 +1,4 @@
SOURCE_FILE@[0; 43)
SOURCE_FILE@[0; 69)
EXTERN_CRATE_ITEM@[0; 17)
EXTERN_KW@[0; 6)
WHITESPACE@[6; 7)
@ -23,3 +23,18 @@ SOURCE_FILE@[0; 43)
IDENT@[38; 41) "bar"
SEMI@[41; 42)
WHITESPACE@[42; 43)
EXTERN_CRATE_ITEM@[43; 68)
EXTERN_KW@[43; 49)
WHITESPACE@[49; 50)
CRATE_KW@[50; 55)
WHITESPACE@[55; 56)
SELF_KW@[56; 60)
SELF_KW@[56; 60)
WHITESPACE@[60; 61)
ALIAS@[61; 67)
AS_KW@[61; 63)
WHITESPACE@[63; 64)
NAME@[64; 67)
IDENT@[64; 67) "baz"
SEMI@[67; 68)
WHITESPACE@[68; 69)