Skip to content

Commit 4cf6736

Browse files
committed
---
yaml --- r: 180049 b: refs/heads/auto c: 03cc48c h: refs/heads/master i: 180047: c7cf8f9 v: v3
1 parent 048444d commit 4cf6736

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 41d6513b8f0429c6775097a7b69570a4c912e8b9
13+
refs/heads/auto: 03cc48c38ddd3bbdf7f928dede249e7c8527edd0
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/grammar/parser-lalr.y

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,7 @@ mod_item
258258

259259
// items that can appear outside of a fn block
260260
item
261-
: item_static
262-
| item_const
263-
| item_type
264-
| block_item
265-
| view_item
261+
: stmt_item
266262
| item_macro
267263
;
268264

@@ -272,8 +268,7 @@ stmt_item
272268
| item_const
273269
| item_type
274270
| block_item
275-
| use_item
276-
| extern_fn_item
271+
| view_item
277272
;
278273

279274
item_static
@@ -295,7 +290,6 @@ view_item
295290
: use_item
296291
| extern_fn_item
297292
| EXTERN CRATE ident ';' { $$ = mk_node("ViewItemExternCrate", 1, $3); }
298-
| EXTERN CRATE ident '=' str ';' { $$ = mk_node("ViewItemExternCrate", 2, $3, $5); }
299293
| EXTERN CRATE str AS ident ';' { $$ = mk_node("ViewItemExternCrate", 2, $3, $5); }
300294
;
301295

0 commit comments

Comments
 (0)