Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into modname_spacing
1 files changed, 113 insertions, 116 deletions
|
|
@@ -9,37 +9,36 @@ [email protected] |
9 | [email protected] ")" |
9 | [email protected] ")" |
10 | [email protected] " " |
10 | [email protected] " " |
11 | [email protected] |
11 | [email protected] |
12 | [email protected] |
12 | [email protected] "{" |
13 | [email protected] "{" |
13 | [email protected] " " |
14 | [email protected] " " |
14 | [email protected] |
15 | [email protected] |
15 | [email protected] |
16 | [email protected] |
16 | [email protected] "[" |
17 | [email protected] "[" |
17 | [email protected] |
18 | [email protected] |
18 | [email protected] "1" |
19 | [email protected] "1" |
19 | [email protected] "," |
20 | [email protected] "," |
20 | [email protected] " " |
21 | [email protected] " " |
21 | [email protected] |
22 | [email protected] |
22 | [email protected] "2" |
23 | [email protected] "2" |
23 | [email protected] "," |
24 | [email protected] "," |
24 | [email protected] " " |
25 | [email protected] " " |
25 | [email protected] |
26 | [email protected] |
26 | [email protected] "@" |
27 | [email protected] "@" |
27 | [email protected] |
28 | [email protected] |
28 | [email protected] |
29 | [email protected] |
29 | [email protected] "," |
30 | [email protected] "," |
30 | [email protected] " " |
31 | [email protected] " " |
31 | [email protected] |
32 | [email protected] |
32 | [email protected] "struct" |
33 | [email protected] "struct" |
33 | [email protected] |
34 | [email protected] |
34 | [email protected] "," |
35 | [email protected] "," |
35 | [email protected] " " |
36 | [email protected] " " |
36 | [email protected] |
37 | [email protected] |
37 | [email protected] "let" |
38 | [email protected] "let" |
38 | [email protected] |
39 | [email protected] |
39 | [email protected] "]" |
40 | [email protected] "]" |
40 | [email protected] " " |
41 | [email protected] " " |
41 | [email protected] "}" |
42 | [email protected] "}" |
| |
43 | [email protected] "\n" |
42 | [email protected] "\n" |
44 | [email protected] |
43 | [email protected] |
45 | [email protected] "fn" |
44 | [email protected] "fn" |
@@ -51,44 +50,43 @@ [email protected] |
51 | [email protected] ")" |
50 | [email protected] ")" |
52 | [email protected] " " |
51 | [email protected] " " |
53 | [email protected] |
52 | [email protected] |
54 | [email protected] |
53 | [email protected] "{" |
55 | [email protected] "{" |
54 | [email protected] " " |
56 | [email protected] " " |
55 | [email protected] |
57 | [email protected] |
56 | [email protected] |
58 | [email protected] |
57 | [email protected] |
59 | [email protected] |
58 | [email protected] |
60 | [email protected] |
59 | [email protected] |
61 | [email protected] |
60 | [email protected] |
62 | [email protected] |
61 | [email protected] "foo" |
63 | [email protected] "foo" |
62 | [email protected] |
64 | [email protected] |
63 | [email protected] "(" |
65 | [email protected] "(" |
64 | [email protected] |
66 | [email protected] |
65 | [email protected] "1" |
67 | [email protected] "1" |
66 | [email protected] "," |
68 | [email protected] "," |
67 | [email protected] " " |
69 | [email protected] " " |
68 | [email protected] |
70 | [email protected] |
69 | [email protected] "2" |
71 | [email protected] "2" |
70 | [email protected] "," |
72 | [email protected] "," |
71 | [email protected] " " |
73 | [email protected] " " |
72 | [email protected] |
74 | [email protected] |
73 | [email protected] "@" |
75 | [email protected] "@" |
74 | [email protected] |
76 | [email protected] |
75 | [email protected] |
77 | [email protected] |
76 | [email protected] "," |
78 | [email protected] "," |
77 | [email protected] " " |
79 | [email protected] " " |
78 | [email protected] |
80 | [email protected] |
79 | [email protected] "impl" |
81 | [email protected] "impl" |
80 | [email protected] |
82 | [email protected] |
81 | [email protected] |
83 | [email protected] |
82 | [email protected] "," |
84 | [email protected] "," |
83 | [email protected] " " |
85 | [email protected] " " |
84 | [email protected] |
86 | [email protected] |
85 | [email protected] "let" |
87 | [email protected] "let" |
86 | [email protected] |
88 | [email protected] |
87 | [email protected] ")" |
89 | [email protected] ")" |
88 | [email protected] " " |
90 | [email protected] " " |
89 | [email protected] "}" |
91 | [email protected] "}" |
| |
92 | [email protected] "\n" |
90 | [email protected] "\n" |
93 | [email protected] |
91 | [email protected] |
94 | [email protected] "fn" |
92 | [email protected] "fn" |
@@ -100,53 +98,52 @@ [email protected] |
100 | [email protected] ")" |
98 | [email protected] ")" |
101 | [email protected] " " |
99 | [email protected] " " |
102 | [email protected] |
100 | [email protected] |
103 | [email protected] |
101 | [email protected] "{" |
104 | [email protected] "{" |
102 | [email protected] " " |
105 | [email protected] " " |
103 | [email protected] |
106 | [email protected] |
104 | [email protected] |
107 | [email protected] |
105 | [email protected] |
108 | [email protected] |
106 | [email protected] |
109 | [email protected] |
107 | [email protected] |
110 | [email protected] |
108 | [email protected] |
111 | [email protected] |
109 | [email protected] "foo" |
112 | [email protected] "foo" |
110 | [email protected] "." |
113 | [email protected] "." |
111 | [email protected] |
114 | [email protected] |
112 | [email protected] "bar" |
115 | [email protected] "bar" |
113 | [email protected] |
116 | [email protected] |
114 | [email protected] "(" |
117 | [email protected] "(" |
115 | [email protected] |
118 | [email protected] |
116 | [email protected] "1" |
119 | [email protected] "1" |
117 | [email protected] "," |
120 | [email protected] "," |
118 | [email protected] " " |
121 | [email protected] " " |
119 | [email protected] |
122 | [email protected] |
120 | [email protected] "2" |
123 | [email protected] "2" |
121 | [email protected] "," |
124 | [email protected] "," |
122 | [email protected] " " |
125 | [email protected] " " |
123 | [email protected] |
126 | [email protected] |
124 | [email protected] "@" |
127 | [email protected] "@" |
125 | [email protected] |
128 | [email protected] |
126 | [email protected] |
129 | [email protected] |
127 | [email protected] "," |
130 | [email protected] "," |
128 | [email protected] " " |
131 | [email protected] " " |
129 | [email protected] |
132 | [email protected] |
130 | [email protected] |
133 | [email protected] |
131 | [email protected] "]" |
134 | [email protected] "]" |
132 | [email protected] |
135 | [email protected] |
133 | [email protected] |
136 | [email protected] |
134 | [email protected] "," |
137 | [email protected] "," |
135 | [email protected] " " |
138 | [email protected] " " |
136 | [email protected] |
139 | [email protected] |
137 | [email protected] "trait" |
140 | [email protected] "trait" |
138 | [email protected] |
141 | [email protected] |
139 | [email protected] "," |
142 | [email protected] "," |
140 | [email protected] " " |
143 | [email protected] " " |
141 | [email protected] |
144 | [email protected] |
142 | [email protected] "let" |
145 | [email protected] "let" |
143 | [email protected] |
146 | [email protected] |
144 | [email protected] ")" |
147 | [email protected] ")" |
145 | [email protected] " " |
148 | [email protected] " " |
146 | [email protected] "}" |
149 | [email protected] "}" |
| |
150 | [email protected] "\n" |
147 | [email protected] "\n" |
151 | error 16..16: expected expression |
148 | error 16..16: expected expression |
152 | error 17..17: expected R_BRACK |
149 | error 17..17: expected R_BRACK |
|