1 files changed, 53 insertions, 53 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index f2c20573e..a18810253 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -2,61 +2,61 @@
 // See `cargo gen-syntax` (defined in crates/tools/src/main.rs)
 Grammar(
    single_byte_tokens: [
-        [";", "SEMI"],
+        (";", "SEMI"),
-        [",", "COMMA"],
+        (",", "COMMA"),
-        ["(", "L_PAREN"],
+        ("(", "L_PAREN"),
-        [")", "R_PAREN"],
+        (")", "R_PAREN"),
-        ["{", "L_CURLY"],
+        ("{", "L_CURLY"),
-        ["}", "R_CURLY"],
+        ("}", "R_CURLY"),
-        ["[", "L_BRACK"],
+        ("[", "L_BRACK"),
-        ["]", "R_BRACK"],
+        ("]", "R_BRACK"),
-        ["<", "L_ANGLE"],
+        ("<", "L_ANGLE"),
-        [">", "R_ANGLE"],
+        (">", "R_ANGLE"),
-        ["@", "AT"],
+        ("@", "AT"),
-        ["#", "POUND"],
+        ("#", "POUND"),
-        ["~", "TILDE"],
+        ("~", "TILDE"),
-        ["?", "QUESTION"],
+        ("?", "QUESTION"),
-        ["$", "DOLLAR"],
+        ("$", "DOLLAR"),
-        ["&", "AMP"],
+        ("&", "AMP"),
-        ["|", "PIPE"],
+        ("|", "PIPE"),
-        ["+", "PLUS"],
+        ("+", "PLUS"),
-        ["*", "STAR"],
+        ("*", "STAR"),
-        ["/", "SLASH"],
+        ("/", "SLASH"),
-        ["^", "CARET"],
+        ("^", "CARET"),
-        ["%", "PERCENT"],
+        ("%", "PERCENT"),
-        ["_", "UNDERSCORE"],
+        ("_", "UNDERSCORE"),
    ],
    // Tokens for which the longest match must be chosen (e.g. `..` is a DOTDOT, but `.` is a DOT)
    multi_byte_tokens: [
-        [".", "DOT"],
+        (".", "DOT"),
-        ["..", "DOTDOT"],
+        ("..", "DOTDOT"),
-        ["...", "DOTDOTDOT"],
+        ("...", "DOTDOTDOT"),
-        ["..=", "DOTDOTEQ"],
+        ("..=", "DOTDOTEQ"),
-        [":", "COLON"],
+        (":", "COLON"),
-        ["::", "COLONCOLON"],
+        ("::", "COLONCOLON"),
-        ["=", "EQ"],
+        ("=", "EQ"),
-        ["==", "EQEQ"],
+        ("==", "EQEQ"),
-        ["=>", "FAT_ARROW"],
+        ("=>", "FAT_ARROW"),
-        ["!", "EXCL"],
+        ("!", "EXCL"),
-        ["!=", "NEQ"],
+        ("!=", "NEQ"),
-        ["-", "MINUS"],
+        ("-", "MINUS"),
-        ["->", "THIN_ARROW"],
+        ("->", "THIN_ARROW"),
-        ["<=", "LTEQ"],
+        ("<=", "LTEQ"),
-        [">=", "GTEQ"],
+        (">=", "GTEQ"),
-        ["+=", "PLUSEQ"],
+        ("+=", "PLUSEQ"),
-        ["-=", "MINUSEQ"],
+        ("-=", "MINUSEQ"),
-        ["|=", "PIPEEQ"],
+        ("|=", "PIPEEQ"),
-        ["&=", "AMPEQ"],
+        ("&=", "AMPEQ"),
-        ["^=", "CARETEQ"],
+        ("^=", "CARETEQ"),
-        ["/=", "SLASHEQ"],
+        ("/=", "SLASHEQ"),
-        ["*=", "STAREQ"],
+        ("*=", "STAREQ"),
-        ["%=", "PERCENTEQ"],
+        ("%=", "PERCENTEQ"),
-        ["&&", "AMPAMP"],
+        ("&&", "AMPAMP"),
-        ["||", "PIPEPIPE"],
+        ("||", "PIPEPIPE"),
-        ["<<", "SHL"],
+        ("<<", "SHL"),
-        [">>", "SHR"],
+        (">>", "SHR"),
-        ["<<=", "SHLEQ"],
+        ("<<=", "SHLEQ"),
-        [">>=", "SHREQ"],
+        (">>=", "SHREQ"),
    ],
    keywords: [
        "async",
@@ -692,7 +692,7 @@ Grammar(
        "LifetimeArg": (),
        "MacroItems": (
-            traits: [ "ModuleItemOwner", "FnDefOwner" ],            
+            traits: [ "ModuleItemOwner", "FnDefOwner" ],
        ),
        "MacroStmts" : (

diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index f2c20573e..a18810253 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron
@@ -2,61 +2,61 @@
2	// See `cargo gen-syntax` (defined in crates/tools/src/main.rs)	2	// See `cargo gen-syntax` (defined in crates/tools/src/main.rs)
3	Grammar(	3	Grammar(
4	single_byte_tokens: [	4	single_byte_tokens: [
5	[";", "SEMI"],	5	(";", "SEMI"),
6	[",", "COMMA"],	6	(",", "COMMA"),
7	["(", "L_PAREN"],	7	("(", "L_PAREN"),
8	[")", "R_PAREN"],	8	(")", "R_PAREN"),
9	["{", "L_CURLY"],	9	("{", "L_CURLY"),
10	["}", "R_CURLY"],	10	("}", "R_CURLY"),
11	["[", "L_BRACK"],	11	("[", "L_BRACK"),
12	["]", "R_BRACK"],	12	("]", "R_BRACK"),
13	["<", "L_ANGLE"],	13	("<", "L_ANGLE"),
14	[">", "R_ANGLE"],	14	(">", "R_ANGLE"),
15	["@", "AT"],	15	("@", "AT"),
16	["#", "POUND"],	16	("#", "POUND"),
17	["~", "TILDE"],	17	("~", "TILDE"),
18	["?", "QUESTION"],	18	("?", "QUESTION"),
19	["$", "DOLLAR"],	19	("$", "DOLLAR"),
20	["&", "AMP"],	20	("&", "AMP"),
21	["\|", "PIPE"],	21	("\|", "PIPE"),
22	["+", "PLUS"],	22	("+", "PLUS"),
23	["*", "STAR"],	23	("*", "STAR"),
24	["/", "SLASH"],	24	("/", "SLASH"),
25	["^", "CARET"],	25	("^", "CARET"),
26	["%", "PERCENT"],	26	("%", "PERCENT"),
27	["_", "UNDERSCORE"],	27	("_", "UNDERSCORE"),
28	],	28	],
29	// Tokens for which the longest match must be chosen (e.g. `..` is a DOTDOT, but `.` is a DOT)	29	// Tokens for which the longest match must be chosen (e.g. `..` is a DOTDOT, but `.` is a DOT)
30	multi_byte_tokens: [	30	multi_byte_tokens: [
31	[".", "DOT"],	31	(".", "DOT"),
32	["..", "DOTDOT"],	32	("..", "DOTDOT"),
33	["...", "DOTDOTDOT"],	33	("...", "DOTDOTDOT"),
34	["..=", "DOTDOTEQ"],	34	("..=", "DOTDOTEQ"),
35	[":", "COLON"],	35	(":", "COLON"),
36	["::", "COLONCOLON"],	36	("::", "COLONCOLON"),
37	["=", "EQ"],	37	("=", "EQ"),
38	["==", "EQEQ"],	38	("==", "EQEQ"),
39	["=>", "FAT_ARROW"],	39	("=>", "FAT_ARROW"),
40	["!", "EXCL"],	40	("!", "EXCL"),
41	["!=", "NEQ"],	41	("!=", "NEQ"),
42	["-", "MINUS"],	42	("-", "MINUS"),
43	["->", "THIN_ARROW"],	43	("->", "THIN_ARROW"),
44	["<=", "LTEQ"],	44	("<=", "LTEQ"),
45	[">=", "GTEQ"],	45	(">=", "GTEQ"),
46	["+=", "PLUSEQ"],	46	("+=", "PLUSEQ"),
47	["-=", "MINUSEQ"],	47	("-=", "MINUSEQ"),
48	["\|=", "PIPEEQ"],	48	("\|=", "PIPEEQ"),
49	["&=", "AMPEQ"],	49	("&=", "AMPEQ"),
50	["^=", "CARETEQ"],	50	("^=", "CARETEQ"),
51	["/=", "SLASHEQ"],	51	("/=", "SLASHEQ"),
52	["*=", "STAREQ"],	52	("*=", "STAREQ"),
53	["%=", "PERCENTEQ"],	53	("%=", "PERCENTEQ"),
54	["&&", "AMPAMP"],	54	("&&", "AMPAMP"),
55	["\|\|", "PIPEPIPE"],	55	("\|\|", "PIPEPIPE"),
56	["<<", "SHL"],	56	("<<", "SHL"),
57	[">>", "SHR"],	57	(">>", "SHR"),
58	["<<=", "SHLEQ"],	58	("<<=", "SHLEQ"),
59	[">>=", "SHREQ"],	59	(">>=", "SHREQ"),
60	],	60	],
61	keywords: [	61	keywords: [
62	"async",	62	"async",
@@ -692,7 +692,7 @@ Grammar(
692	"LifetimeArg": (),	692	"LifetimeArg": (),
693		693
694	"MacroItems": (	694	"MacroItems": (
695	traits: [ "ModuleItemOwner", "FnDefOwner" ],	695	traits: [ "ModuleItemOwner", "FnDefOwner" ],
696	),	696	),
697		697
698	"MacroStmts" : (	698	"MacroStmts" : (