aboutsummaryrefslogtreecommitdiff
path: root/src/parser/grammar/items/mod.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-02-11 14:59:58 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-02-11 14:59:58 +0000
commita6f9b0414cf5bf49ad7f714b9d3fe5af91a16404 (patch)
tree2fc1e8ccc43bbee85a06026270d7c8de5959e323 /src/parser/grammar/items/mod.rs
parent7a0ada860b57acd44b1d53e944ae621e438652da (diff)
parentf356628ad8392c6e3ffd72a9ac50a7be87d3d183 (diff)
Merge #50
50: Shiny new parser r=matklad a=matklad bors r+
Diffstat (limited to 'src/parser/grammar/items/mod.rs')
-rw-r--r--src/parser/grammar/items/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parser/grammar/items/mod.rs b/src/parser/grammar/items/mod.rs
index 18ee8af86..3af6d13a1 100644
--- a/src/parser/grammar/items/mod.rs
+++ b/src/parser/grammar/items/mod.rs
@@ -94,7 +94,7 @@ fn item(p: &mut Parser) {
94 94
95 // test unsafe_auto_trait 95 // test unsafe_auto_trait
96 // unsafe auto trait T {} 96 // unsafe auto trait T {}
97 IDENT if p.at_kw("auto") && la == TRAIT_KW => { 97 IDENT if p.at_contextual_kw("auto") && la == TRAIT_KW => {
98 p.bump_remap(AUTO_KW); 98 p.bump_remap(AUTO_KW);
99 traits::trait_item(p); 99 traits::trait_item(p);
100 TRAIT_ITEM 100 TRAIT_ITEM
@@ -109,7 +109,7 @@ fn item(p: &mut Parser) {
109 109
110 // test unsafe_default_impl 110 // test unsafe_default_impl
111 // unsafe default impl Foo {} 111 // unsafe default impl Foo {}
112 IDENT if p.at_kw("default") && la == IMPL_KW => { 112 IDENT if p.at_contextual_kw("default") && la == IMPL_KW => {
113 p.bump_remap(DEFAULT_KW); 113 p.bump_remap(DEFAULT_KW);
114 traits::impl_item(p); 114 traits::impl_item(p);
115 IMPL_ITEM 115 IMPL_ITEM