From 0ae26c344aa7477a18c2019cfa0062a9a745d70d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 9 Feb 2018 22:44:50 +0300 Subject: Drop ErrorBuilder nonsense --- src/parser/grammar/items/mod.rs | 8 ++++---- src/parser/grammar/items/structs.rs | 4 ++-- src/parser/grammar/items/use_item.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/parser/grammar/items') diff --git a/src/parser/grammar/items/mod.rs b/src/parser/grammar/items/mod.rs index 37f2ab132..b73628ec0 100644 --- a/src/parser/grammar/items/mod.rs +++ b/src/parser/grammar/items/mod.rs @@ -51,7 +51,7 @@ fn item(p: &mut Parser) { // extern struct Foo; _ => { item.abandon(p); - p.error().message("expected `fn` or `{`").emit(); + p.error("expected `fn` or `{`"); return; } } @@ -121,7 +121,7 @@ fn item(p: &mut Parser) { abi(p); if !p.at(FN_KW) { item.abandon(p); - p.error().message("expected function").emit(); + p.error("expected function"); return; } fn_item(p); @@ -144,7 +144,7 @@ fn item(p: &mut Parser) { if t == L_CURLY { error_block(p, message); } else { - p.error().message(message).emit(); + p.error(message); } return; } @@ -234,7 +234,7 @@ fn fn_item(p: &mut Parser) { if p.at(L_PAREN) { fn_value_parameters(p); } else { - p.error().message("expected function arguments").emit(); + p.error("expected function arguments"); } if p.at(L_CURLY) { diff --git a/src/parser/grammar/items/structs.rs b/src/parser/grammar/items/structs.rs index 69d95c698..640b940e4 100644 --- a/src/parser/grammar/items/structs.rs +++ b/src/parser/grammar/items/structs.rs @@ -19,7 +19,7 @@ pub(super) fn struct_item(p: &mut Parser) { L_CURLY => named_fields(p), _ => { //TODO: special case `(` error message - p.error().message("expected `;` or `{`").emit(); + p.error("expected `;` or `{`"); return; } } @@ -34,7 +34,7 @@ pub(super) fn struct_item(p: &mut Parser) { p.expect(SEMI); } _ => { - p.error().message("expected `;`, `{`, or `(`").emit(); + p.error("expected `;`, `{`, or `(`"); return; } } diff --git a/src/parser/grammar/items/use_item.rs b/src/parser/grammar/items/use_item.rs index 38e7b3f8a..a3f7f0da8 100644 --- a/src/parser/grammar/items/use_item.rs +++ b/src/parser/grammar/items/use_item.rs @@ -37,7 +37,7 @@ fn use_tree(p: &mut Parser) { L_CURLY => nested_trees(p), _ => { // is this unreachable? - p.error().message("expected `{` or `*`").emit(); + p.error("expected `{` or `*`"); } } } -- cgit v1.2.3