1 files changed, 48 insertions, 88 deletions
diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/ra_syntax/src/parsing/lexer.rs
index 06822ea91..bdb01d40b 100644
--- a/crates/ra_syntax/src/parsing/lexer.rs
+++ b/crates/ra_syntax/src/parsing/lexer.rs
@@ -12,16 +12,16 @@ pub struct Token {
    pub len: TextUnit,
 }
-fn match_literal_kind(kind: ra_rustc_lexer::LiteralKind) -> SyntaxKind {
+fn match_literal_kind(kind: rustc_lexer::LiteralKind) -> SyntaxKind {
    match kind {
-        ra_rustc_lexer::LiteralKind::Int { .. } => INT_NUMBER,
+        rustc_lexer::LiteralKind::Int { .. } => INT_NUMBER,
-        ra_rustc_lexer::LiteralKind::Float { .. } => FLOAT_NUMBER,
+        rustc_lexer::LiteralKind::Float { .. } => FLOAT_NUMBER,
-        ra_rustc_lexer::LiteralKind::Char { .. } => CHAR,
+        rustc_lexer::LiteralKind::Char { .. } => CHAR,
-        ra_rustc_lexer::LiteralKind::Byte { .. } => BYTE,
+        rustc_lexer::LiteralKind::Byte { .. } => BYTE,
-        ra_rustc_lexer::LiteralKind::Str { .. } => STRING,
+        rustc_lexer::LiteralKind::Str { .. } => STRING,
-        ra_rustc_lexer::LiteralKind::ByteStr { .. } => BYTE_STRING,
+        rustc_lexer::LiteralKind::ByteStr { .. } => BYTE_STRING,
-        ra_rustc_lexer::LiteralKind::RawStr { .. } => RAW_STRING,
+        rustc_lexer::LiteralKind::RawStr { .. } => RAW_STRING,
-        ra_rustc_lexer::LiteralKind::RawByteStr { .. } => RAW_BYTE_STRING,
+        rustc_lexer::LiteralKind::RawByteStr { .. } => RAW_BYTE_STRING,
    }
 }
@@ -32,32 +32,17 @@ pub fn tokenize(text: &str) -> Vec<Token> {
    }
    let mut text = text;
    let mut acc = Vec::new();
-    if let Some(len) = ra_rustc_lexer::strip_shebang(text) {
+    if let Some(len) = rustc_lexer::strip_shebang(text) {
        acc.push(Token { kind: SHEBANG, len: TextUnit::from_usize(len) });
        text = &text[len..];
    }
    while !text.is_empty() {
-        let rustc_token = ra_rustc_lexer::first_token(text);
+        let rustc_token = rustc_lexer::first_token(text);
-        macro_rules! decompose {
-            ($t1:expr, $t2:expr) => {{
-                acc.push(Token { kind: $t1, len: 1.into() });
-                acc.push(Token { kind: $t2, len: 1.into() });
-                text = &text[2..];
-                continue;
-            }};
-            ($t1:expr, $t2:expr, $t3:expr) => {{
-                acc.push(Token { kind: $t1, len: 1.into() });
-                acc.push(Token { kind: $t2, len: 1.into() });
-                acc.push(Token { kind: $t3, len: 1.into() });
-                text = &text[3..];
-                continue;
-            }};
-        }
        let kind = match rustc_token.kind {
-            ra_rustc_lexer::TokenKind::LineComment => COMMENT,
+            rustc_lexer::TokenKind::LineComment => COMMENT,
-            ra_rustc_lexer::TokenKind::BlockComment { .. } => COMMENT,
+            rustc_lexer::TokenKind::BlockComment { .. } => COMMENT,
-            ra_rustc_lexer::TokenKind::Whitespace => WHITESPACE,
+            rustc_lexer::TokenKind::Whitespace => WHITESPACE,
-            ra_rustc_lexer::TokenKind::Ident => {
+            rustc_lexer::TokenKind::Ident => {
                let token_text = &text[..rustc_token.len];
                if token_text == "_" {
                    UNDERSCORE
@@ -65,62 +50,37 @@ pub fn tokenize(text: &str) -> Vec<Token> {
                    SyntaxKind::from_keyword(&text[..rustc_token.len]).unwrap_or(IDENT)
                }
            }
-            ra_rustc_lexer::TokenKind::RawIdent => IDENT,
+            rustc_lexer::TokenKind::RawIdent => IDENT,
-            ra_rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),
+            rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),
-            ra_rustc_lexer::TokenKind::Lifetime { .. } => LIFETIME,
+            rustc_lexer::TokenKind::Lifetime { .. } => LIFETIME,
-            ra_rustc_lexer::TokenKind::Semi => SEMI,
+            rustc_lexer::TokenKind::Semi => SEMI,
-            ra_rustc_lexer::TokenKind::Comma => COMMA,
+            rustc_lexer::TokenKind::Comma => COMMA,
-            ra_rustc_lexer::TokenKind::DotDotDot => decompose!(DOT, DOT, DOT),
+            rustc_lexer::TokenKind::Dot => DOT,
-            ra_rustc_lexer::TokenKind::DotDotEq => decompose!(DOT, DOT, EQ),
+            rustc_lexer::TokenKind::OpenParen => L_PAREN,
-            ra_rustc_lexer::TokenKind::DotDot => decompose!(DOT, DOT),
+            rustc_lexer::TokenKind::CloseParen => R_PAREN,
-            ra_rustc_lexer::TokenKind::Dot => DOT,
+            rustc_lexer::TokenKind::OpenBrace => L_CURLY,
-            ra_rustc_lexer::TokenKind::OpenParen => L_PAREN,
+            rustc_lexer::TokenKind::CloseBrace => R_CURLY,
-            ra_rustc_lexer::TokenKind::CloseParen => R_PAREN,
+            rustc_lexer::TokenKind::OpenBracket => L_BRACK,
-            ra_rustc_lexer::TokenKind::OpenBrace => L_CURLY,
+            rustc_lexer::TokenKind::CloseBracket => R_BRACK,
-            ra_rustc_lexer::TokenKind::CloseBrace => R_CURLY,
+            rustc_lexer::TokenKind::At => AT,
-            ra_rustc_lexer::TokenKind::OpenBracket => L_BRACK,
+            rustc_lexer::TokenKind::Pound => POUND,
-            ra_rustc_lexer::TokenKind::CloseBracket => R_BRACK,
+            rustc_lexer::TokenKind::Tilde => TILDE,
-            ra_rustc_lexer::TokenKind::At => AT,
+            rustc_lexer::TokenKind::Question => QUESTION,
-            ra_rustc_lexer::TokenKind::Pound => POUND,
+            rustc_lexer::TokenKind::Colon => COLON,
-            ra_rustc_lexer::TokenKind::Tilde => TILDE,
+            rustc_lexer::TokenKind::Dollar => DOLLAR,
-            ra_rustc_lexer::TokenKind::Question => QUESTION,
+            rustc_lexer::TokenKind::Eq => EQ,
-            ra_rustc_lexer::TokenKind::ColonColon => decompose!(COLON, COLON),
+            rustc_lexer::TokenKind::Not => EXCL,
-            ra_rustc_lexer::TokenKind::Colon => COLON,
+            rustc_lexer::TokenKind::Lt => L_ANGLE,
-            ra_rustc_lexer::TokenKind::Dollar => DOLLAR,
+            rustc_lexer::TokenKind::Gt => R_ANGLE,
-            ra_rustc_lexer::TokenKind::EqEq => decompose!(EQ, EQ),
+            rustc_lexer::TokenKind::Minus => MINUS,
-            ra_rustc_lexer::TokenKind::Eq => EQ,
+            rustc_lexer::TokenKind::And => AMP,
-            ra_rustc_lexer::TokenKind::FatArrow => decompose!(EQ, R_ANGLE),
+            rustc_lexer::TokenKind::Or => PIPE,
-            ra_rustc_lexer::TokenKind::Ne => decompose!(EXCL, EQ),
+            rustc_lexer::TokenKind::Plus => PLUS,
-            ra_rustc_lexer::TokenKind::Not => EXCL,
+            rustc_lexer::TokenKind::Star => STAR,
-            ra_rustc_lexer::TokenKind::Le => decompose!(L_ANGLE, EQ),
+            rustc_lexer::TokenKind::Slash => SLASH,
-            ra_rustc_lexer::TokenKind::LArrow => decompose!(COLON, MINUS),
+            rustc_lexer::TokenKind::Caret => CARET,
-            ra_rustc_lexer::TokenKind::Lt => L_ANGLE,
+            rustc_lexer::TokenKind::Percent => PERCENT,
-            ra_rustc_lexer::TokenKind::ShlEq => decompose!(L_ANGLE, L_ANGLE, EQ),
+            rustc_lexer::TokenKind::Unknown => ERROR,
-            ra_rustc_lexer::TokenKind::Shl => decompose!(L_ANGLE, L_ANGLE),
-            ra_rustc_lexer::TokenKind::Ge => decompose!(R_ANGLE, EQ),
-            ra_rustc_lexer::TokenKind::Gt => R_ANGLE,
-            ra_rustc_lexer::TokenKind::ShrEq => decompose!(R_ANGLE, R_ANGLE, EQ),
-            ra_rustc_lexer::TokenKind::Shr => decompose!(R_ANGLE, R_ANGLE),
-            ra_rustc_lexer::TokenKind::RArrow => decompose!(MINUS, R_ANGLE),
-            ra_rustc_lexer::TokenKind::Minus => MINUS,
-            ra_rustc_lexer::TokenKind::MinusEq => decompose!(MINUS, EQ),
-            ra_rustc_lexer::TokenKind::And => AMP,
-            ra_rustc_lexer::TokenKind::AndAnd => decompose!(AMP, AMP),
-            ra_rustc_lexer::TokenKind::AndEq => decompose!(AMP, EQ),
-            ra_rustc_lexer::TokenKind::Or => PIPE,
-            ra_rustc_lexer::TokenKind::OrOr => decompose!(PIPE, PIPE),
-            ra_rustc_lexer::TokenKind::OrEq => decompose!(PIPE, EQ),
-            ra_rustc_lexer::TokenKind::PlusEq => decompose!(PLUS, EQ),
-            ra_rustc_lexer::TokenKind::Plus => PLUS,
-            ra_rustc_lexer::TokenKind::StarEq => decompose!(STAR, EQ),
-            ra_rustc_lexer::TokenKind::Star => STAR,
-            ra_rustc_lexer::TokenKind::SlashEq => decompose!(SLASH, EQ),
-            ra_rustc_lexer::TokenKind::Slash => SLASH,
-            ra_rustc_lexer::TokenKind::CaretEq => decompose!(CARET, EQ),
-            ra_rustc_lexer::TokenKind::Caret => CARET,
-            ra_rustc_lexer::TokenKind::PercentEq => decompose!(PERCENT, EQ),
-            ra_rustc_lexer::TokenKind::Percent => PERCENT,
-            ra_rustc_lexer::TokenKind::Unknown => ERROR,
        };
        let token = Token { kind, len: TextUnit::from_usize(rustc_token.len) };
        acc.push(token);
@@ -130,12 +90,12 @@ pub fn tokenize(text: &str) -> Vec<Token> {
 }
 pub fn classify_literal(text: &str) -> Option<Token> {
-    let t = ra_rustc_lexer::first_token(text);
+    let t = rustc_lexer::first_token(text);
    if t.len != text.len() {
        return None;
    }
    let kind = match t.kind {
-        ra_rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),
+        rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),
        _ => return None,
    };
    Some(Token { kind, len: TextUnit::from_usize(t.len) })

diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/ra_syntax/src/parsing/lexer.rs index 06822ea91..bdb01d40b 100644 --- a/crates/ra_syntax/src/parsing/lexer.rs +++ b/crates/ra_syntax/src/parsing/lexer.rs
@@ -12,16 +12,16 @@ pub struct Token {
12	pub len: TextUnit,	12	pub len: TextUnit,
13	}	13	}
14		14
15	fn match_literal_kind(kind: ra_rustc_lexer::LiteralKind) -> SyntaxKind {	15	fn match_literal_kind(kind: rustc_lexer::LiteralKind) -> SyntaxKind {
16	match kind {	16	match kind {
17	ra_rustc_lexer::LiteralKind::Int { .. } => INT_NUMBER,	17	rustc_lexer::LiteralKind::Int { .. } => INT_NUMBER,
18	ra_rustc_lexer::LiteralKind::Float { .. } => FLOAT_NUMBER,	18	rustc_lexer::LiteralKind::Float { .. } => FLOAT_NUMBER,
19	ra_rustc_lexer::LiteralKind::Char { .. } => CHAR,	19	rustc_lexer::LiteralKind::Char { .. } => CHAR,
20	ra_rustc_lexer::LiteralKind::Byte { .. } => BYTE,	20	rustc_lexer::LiteralKind::Byte { .. } => BYTE,
21	ra_rustc_lexer::LiteralKind::Str { .. } => STRING,	21	rustc_lexer::LiteralKind::Str { .. } => STRING,
22	ra_rustc_lexer::LiteralKind::ByteStr { .. } => BYTE_STRING,	22	rustc_lexer::LiteralKind::ByteStr { .. } => BYTE_STRING,
23	ra_rustc_lexer::LiteralKind::RawStr { .. } => RAW_STRING,	23	rustc_lexer::LiteralKind::RawStr { .. } => RAW_STRING,
24	ra_rustc_lexer::LiteralKind::RawByteStr { .. } => RAW_BYTE_STRING,	24	rustc_lexer::LiteralKind::RawByteStr { .. } => RAW_BYTE_STRING,
25	}	25	}
26	}	26	}
27		27
@@ -32,32 +32,17 @@ pub fn tokenize(text: &str) -> Vec<Token> {
32	}	32	}
33	let mut text = text;	33	let mut text = text;
34	let mut acc = Vec::new();	34	let mut acc = Vec::new();
35	if let Some(len) = ra_rustc_lexer::strip_shebang(text) {	35	if let Some(len) = rustc_lexer::strip_shebang(text) {
36	acc.push(Token { kind: SHEBANG, len: TextUnit::from_usize(len) });	36	acc.push(Token { kind: SHEBANG, len: TextUnit::from_usize(len) });
37	text = &text[len..];	37	text = &text[len..];
38	}	38	}
39	while !text.is_empty() {	39	while !text.is_empty() {
40	let rustc_token = ra_rustc_lexer::first_token(text);	40	let rustc_token = rustc_lexer::first_token(text);
41	macro_rules! decompose {
42	($t1:expr, $t2:expr) => {{
43	acc.push(Token { kind: $t1, len: 1.into() });
44	acc.push(Token { kind: $t2, len: 1.into() });
45	text = &text[2..];
46	continue;
47	}};
48	($t1:expr, $t2:expr, $t3:expr) => {{
49	acc.push(Token { kind: $t1, len: 1.into() });
50	acc.push(Token { kind: $t2, len: 1.into() });
51	acc.push(Token { kind: $t3, len: 1.into() });
52	text = &text[3..];
53	continue;
54	}};
55	}
56	let kind = match rustc_token.kind {	41	let kind = match rustc_token.kind {
57	ra_rustc_lexer::TokenKind::LineComment => COMMENT,	42	rustc_lexer::TokenKind::LineComment => COMMENT,
58	ra_rustc_lexer::TokenKind::BlockComment { .. } => COMMENT,	43	rustc_lexer::TokenKind::BlockComment { .. } => COMMENT,
59	ra_rustc_lexer::TokenKind::Whitespace => WHITESPACE,	44	rustc_lexer::TokenKind::Whitespace => WHITESPACE,
60	ra_rustc_lexer::TokenKind::Ident => {	45	rustc_lexer::TokenKind::Ident => {
61	let token_text = &text[..rustc_token.len];	46	let token_text = &text[..rustc_token.len];
62	if token_text == "_" {	47	if token_text == "_" {
63	UNDERSCORE	48	UNDERSCORE
@@ -65,62 +50,37 @@ pub fn tokenize(text: &str) -> Vec<Token> {
65	SyntaxKind::from_keyword(&text[..rustc_token.len]).unwrap_or(IDENT)	50	SyntaxKind::from_keyword(&text[..rustc_token.len]).unwrap_or(IDENT)
66	}	51	}
67	}	52	}
68	ra_rustc_lexer::TokenKind::RawIdent => IDENT,	53	rustc_lexer::TokenKind::RawIdent => IDENT,
69	ra_rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),	54	rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),
70	ra_rustc_lexer::TokenKind::Lifetime { .. } => LIFETIME,	55	rustc_lexer::TokenKind::Lifetime { .. } => LIFETIME,
71	ra_rustc_lexer::TokenKind::Semi => SEMI,	56	rustc_lexer::TokenKind::Semi => SEMI,
72	ra_rustc_lexer::TokenKind::Comma => COMMA,	57	rustc_lexer::TokenKind::Comma => COMMA,
73	ra_rustc_lexer::TokenKind::DotDotDot => decompose!(DOT, DOT, DOT),	58	rustc_lexer::TokenKind::Dot => DOT,
74	ra_rustc_lexer::TokenKind::DotDotEq => decompose!(DOT, DOT, EQ),	59	rustc_lexer::TokenKind::OpenParen => L_PAREN,
75	ra_rustc_lexer::TokenKind::DotDot => decompose!(DOT, DOT),	60	rustc_lexer::TokenKind::CloseParen => R_PAREN,
76	ra_rustc_lexer::TokenKind::Dot => DOT,	61	rustc_lexer::TokenKind::OpenBrace => L_CURLY,
77	ra_rustc_lexer::TokenKind::OpenParen => L_PAREN,	62	rustc_lexer::TokenKind::CloseBrace => R_CURLY,
78	ra_rustc_lexer::TokenKind::CloseParen => R_PAREN,	63	rustc_lexer::TokenKind::OpenBracket => L_BRACK,
79	ra_rustc_lexer::TokenKind::OpenBrace => L_CURLY,	64	rustc_lexer::TokenKind::CloseBracket => R_BRACK,
80	ra_rustc_lexer::TokenKind::CloseBrace => R_CURLY,	65	rustc_lexer::TokenKind::At => AT,
81	ra_rustc_lexer::TokenKind::OpenBracket => L_BRACK,	66	rustc_lexer::TokenKind::Pound => POUND,
82	ra_rustc_lexer::TokenKind::CloseBracket => R_BRACK,	67	rustc_lexer::TokenKind::Tilde => TILDE,
83	ra_rustc_lexer::TokenKind::At => AT,	68	rustc_lexer::TokenKind::Question => QUESTION,
84	ra_rustc_lexer::TokenKind::Pound => POUND,	69	rustc_lexer::TokenKind::Colon => COLON,
85	ra_rustc_lexer::TokenKind::Tilde => TILDE,	70	rustc_lexer::TokenKind::Dollar => DOLLAR,
86	ra_rustc_lexer::TokenKind::Question => QUESTION,	71	rustc_lexer::TokenKind::Eq => EQ,
87	ra_rustc_lexer::TokenKind::ColonColon => decompose!(COLON, COLON),	72	rustc_lexer::TokenKind::Not => EXCL,
88	ra_rustc_lexer::TokenKind::Colon => COLON,	73	rustc_lexer::TokenKind::Lt => L_ANGLE,
89	ra_rustc_lexer::TokenKind::Dollar => DOLLAR,	74	rustc_lexer::TokenKind::Gt => R_ANGLE,
90	ra_rustc_lexer::TokenKind::EqEq => decompose!(EQ, EQ),	75	rustc_lexer::TokenKind::Minus => MINUS,
91	ra_rustc_lexer::TokenKind::Eq => EQ,	76	rustc_lexer::TokenKind::And => AMP,
92	ra_rustc_lexer::TokenKind::FatArrow => decompose!(EQ, R_ANGLE),	77	rustc_lexer::TokenKind::Or => PIPE,
93	ra_rustc_lexer::TokenKind::Ne => decompose!(EXCL, EQ),	78	rustc_lexer::TokenKind::Plus => PLUS,
94	ra_rustc_lexer::TokenKind::Not => EXCL,	79	rustc_lexer::TokenKind::Star => STAR,
95	ra_rustc_lexer::TokenKind::Le => decompose!(L_ANGLE, EQ),	80	rustc_lexer::TokenKind::Slash => SLASH,
96	ra_rustc_lexer::TokenKind::LArrow => decompose!(COLON, MINUS),	81	rustc_lexer::TokenKind::Caret => CARET,
97	ra_rustc_lexer::TokenKind::Lt => L_ANGLE,	82	rustc_lexer::TokenKind::Percent => PERCENT,
98	ra_rustc_lexer::TokenKind::ShlEq => decompose!(L_ANGLE, L_ANGLE, EQ),	83	rustc_lexer::TokenKind::Unknown => ERROR,
99	ra_rustc_lexer::TokenKind::Shl => decompose!(L_ANGLE, L_ANGLE),
100	ra_rustc_lexer::TokenKind::Ge => decompose!(R_ANGLE, EQ),
101	ra_rustc_lexer::TokenKind::Gt => R_ANGLE,
102	ra_rustc_lexer::TokenKind::ShrEq => decompose!(R_ANGLE, R_ANGLE, EQ),
103	ra_rustc_lexer::TokenKind::Shr => decompose!(R_ANGLE, R_ANGLE),
104	ra_rustc_lexer::TokenKind::RArrow => decompose!(MINUS, R_ANGLE),
105	ra_rustc_lexer::TokenKind::Minus => MINUS,
106	ra_rustc_lexer::TokenKind::MinusEq => decompose!(MINUS, EQ),
107	ra_rustc_lexer::TokenKind::And => AMP,
108	ra_rustc_lexer::TokenKind::AndAnd => decompose!(AMP, AMP),
109	ra_rustc_lexer::TokenKind::AndEq => decompose!(AMP, EQ),
110	ra_rustc_lexer::TokenKind::Or => PIPE,
111	ra_rustc_lexer::TokenKind::OrOr => decompose!(PIPE, PIPE),
112	ra_rustc_lexer::TokenKind::OrEq => decompose!(PIPE, EQ),
113	ra_rustc_lexer::TokenKind::PlusEq => decompose!(PLUS, EQ),
114	ra_rustc_lexer::TokenKind::Plus => PLUS,
115	ra_rustc_lexer::TokenKind::StarEq => decompose!(STAR, EQ),
116	ra_rustc_lexer::TokenKind::Star => STAR,
117	ra_rustc_lexer::TokenKind::SlashEq => decompose!(SLASH, EQ),
118	ra_rustc_lexer::TokenKind::Slash => SLASH,
119	ra_rustc_lexer::TokenKind::CaretEq => decompose!(CARET, EQ),
120	ra_rustc_lexer::TokenKind::Caret => CARET,
121	ra_rustc_lexer::TokenKind::PercentEq => decompose!(PERCENT, EQ),
122	ra_rustc_lexer::TokenKind::Percent => PERCENT,
123	ra_rustc_lexer::TokenKind::Unknown => ERROR,
124	};	84	};
125	let token = Token { kind, len: TextUnit::from_usize(rustc_token.len) };	85	let token = Token { kind, len: TextUnit::from_usize(rustc_token.len) };
126	acc.push(token);	86	acc.push(token);
@@ -130,12 +90,12 @@ pub fn tokenize(text: &str) -> Vec<Token> {
130	}	90	}
131		91
132	pub fn classify_literal(text: &str) -> Option<Token> {	92	pub fn classify_literal(text: &str) -> Option<Token> {
133	let t = ra_rustc_lexer::first_token(text);	93	let t = rustc_lexer::first_token(text);
134	if t.len != text.len() {	94	if t.len != text.len() {
135	return None;	95	return None;
136	}	96	}
137	let kind = match t.kind {	97	let kind = match t.kind {
138	ra_rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),	98	rustc_lexer::TokenKind::Literal { kind, .. } => match_literal_kind(kind),
139	_ => return None,	99	_ => return None,
140	};	100	};
141	Some(Token { kind, len: TextUnit::from_usize(t.len) })	101	Some(Token { kind, len: TextUnit::from_usize(t.len) })