diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-11 09:58:32 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-11 09:58:32 +0000 |
| commit | 7176029803fe2e00f29ab7d20a384e3ee6f53ba3 (patch) | |
| tree | 51e7251231162d5d31b6e18fabdbb466ffb94d19 /src/parser/grammar/items/structs.rs | |
| parent | e19d038a0e1d9af8270450c5fe8fbbdf0f15cb24 (diff) | |
| parent | 96437b050f2743fef2e37eaab7259f2f98f9b473 (diff) | |
Merge #48
48: Types r=matklad a=matklad
bors r+
Diffstat (limited to 'src/parser/grammar/items/structs.rs')
| -rw-r--r-- | src/parser/grammar/items/structs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parser/grammar/items/structs.rs b/src/parser/grammar/items/structs.rs index ad18fd270..c72b50808 100644 --- a/src/parser/grammar/items/structs.rs +++ b/src/parser/grammar/items/structs.rs | |||
| @@ -89,7 +89,7 @@ fn named_fields(p: &mut Parser) { | |||
| 89 | if p.at(IDENT) { | 89 | if p.at(IDENT) { |
| 90 | name(p); | 90 | name(p); |
| 91 | p.expect(COLON); | 91 | p.expect(COLON); |
| 92 | types::ty(p); | 92 | types::type_(p); |
| 93 | field.complete(p, NAMED_FIELD); | 93 | field.complete(p, NAMED_FIELD); |
| 94 | } else { | 94 | } else { |
| 95 | field.abandon(p); | 95 | field.abandon(p); |
| @@ -105,7 +105,7 @@ fn pos_fields(p: &mut Parser) { | |||
| 105 | while !p.at(R_PAREN) && !p.at(EOF) { | 105 | while !p.at(R_PAREN) && !p.at(EOF) { |
| 106 | let pos_field = p.start(); | 106 | let pos_field = p.start(); |
| 107 | visibility(p); | 107 | visibility(p); |
| 108 | types::ty(p); | 108 | types::type_(p); |
| 109 | pos_field.complete(p, POS_FIELD); | 109 | pos_field.complete(p, POS_FIELD); |
| 110 | 110 | ||
| 111 | if !p.at(R_PAREN) { | 111 | if !p.at(R_PAREN) { |