Skip to content

Commit 6bf0fb1

Browse files
committed
---
yaml --- r: 180129 b: refs/heads/tmp c: 03cc48c h: refs/heads/master i: 180127: 87190ad v: v3
1 parent a9ec55c commit 6bf0fb1

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
@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 41d6513b8f0429c6775097a7b69570a4c912e8b9
37+
refs/heads/tmp: 03cc48c38ddd3bbdf7f928dede249e7c8527edd0

branches/tmp/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)