diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-09 19:56:18 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-09 19:56:18 +0000 |
commit | 419b9b7e5efd895249934551cb2588b27a956f58 (patch) | |
tree | 4d53f6d5e34a4244f0aaeb2039454e3594856324 /src/parser/grammar/mod.rs | |
parent | 550b17d7cf321c2aebff75d00b1654b55beca53c (diff) | |
parent | ac932df22a993f0b287e60aa42055405ef94a6ae (diff) |
Merge #44
44: Drop ErrorBuilder nonsense r=matklad a=matklad
Diffstat (limited to 'src/parser/grammar/mod.rs')
-rw-r--r-- | src/parser/grammar/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parser/grammar/mod.rs b/src/parser/grammar/mod.rs index afce308d0..b949583ff 100644 --- a/src/parser/grammar/mod.rs +++ b/src/parser/grammar/mod.rs | |||
@@ -53,7 +53,7 @@ fn alias(p: &mut Parser) -> bool { | |||
53 | fn error_block(p: &mut Parser, message: &str) { | 53 | fn error_block(p: &mut Parser, message: &str) { |
54 | assert!(p.at(L_CURLY)); | 54 | assert!(p.at(L_CURLY)); |
55 | let err = p.start(); | 55 | let err = p.start(); |
56 | p.error().message(message).emit(); | 56 | p.error(message); |
57 | p.bump(); | 57 | p.bump(); |
58 | let mut level: u32 = 1; | 58 | let mut level: u32 = 1; |
59 | while level > 0 && !p.at(EOF) { | 59 | while level > 0 && !p.at(EOF) { |
@@ -74,7 +74,7 @@ impl<'p> Parser<'p> { | |||
74 | 74 | ||
75 | fn err_and_bump(&mut self, message: &str) { | 75 | fn err_and_bump(&mut self, message: &str) { |
76 | let err = self.start(); | 76 | let err = self.start(); |
77 | self.error().message(message).emit(); | 77 | self.error(message); |
78 | self.bump(); | 78 | self.bump(); |
79 | err.complete(self, ERROR); | 79 | err.complete(self, ERROR); |
80 | } | 80 | } |
@@ -84,7 +84,7 @@ impl<'p> Parser<'p> { | |||
84 | self.bump(); | 84 | self.bump(); |
85 | true | 85 | true |
86 | } else { | 86 | } else { |
87 | self.error().message(format!("expected {:?}", kind)).emit(); | 87 | self.error(format!("expected {:?}", kind)); |
88 | false | 88 | false |
89 | } | 89 | } |
90 | } | 90 | } |