diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-10 21:47:04 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-10 21:47:04 +0000 |
| commit | e19d038a0e1d9af8270450c5fe8fbbdf0f15cb24 (patch) | |
| tree | 5bac76244148ce5b368bc8cb83a05cc184c452a7 /src/parser/grammar/items/structs.rs | |
| parent | b814d931514cdc250f9156dabd874edf685569d0 (diff) | |
| parent | b097090690f5edbe03f4aa9d042ba26c123699e4 (diff) | |
Merge #47
47: G: more 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 eca0d2e64..ad18fd270 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::type_ref(p); | 92 | types::ty(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::type_ref(p); | 108 | types::ty(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) { |