From e2ef4f64e777f293a0408d0f60cfed9de69c7bb6 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sun, 26 Jul 2020 17:28:43 +0200 Subject: =?UTF-8?q?Rename=20errors=20to=20problems=20and=20make=20error!?= =?UTF-8?q?=20macro=20more=20ergonomic=20=F0=9F=A7=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also adds a `warning!` macro. --- src/func.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/func.rs') diff --git a/src/func.rs b/src/func.rs index 33cc6e83..777e0b26 100644 --- a/src/func.rs +++ b/src/func.rs @@ -7,7 +7,7 @@ use crate::syntax::span::Spanned; /// Types that are useful for creating your own functions. pub mod prelude { - pub use crate::{function, body, err}; + pub use crate::{function, body, error, warning}; pub use crate::layout::prelude::*; pub use crate::layout::Command::{self, *}; pub use crate::style::{LayoutStyle, PageStyle, TextStyle}; @@ -55,8 +55,8 @@ pub trait ParseFunc { /// /// parse(header, body, ctx, f) { /// let body = body!(opt: body, ctx, f); -/// let hidden = header.args.pos.get::(&mut f.errors) -/// .or_missing(&mut f.errors, header.name.span, "hidden") +/// let hidden = header.args.pos.get::(&mut f.problems) +/// .or_missing(&mut f.problems, header.name.span, "hidden") /// .unwrap_or(false); /// /// HiderFunc { body: if hidden { None } else { body } } @@ -132,7 +132,7 @@ macro_rules! function { let func = $code; for arg in header.args.into_iter() { - feedback.errors.push(err!(arg.span; "unexpected argument")); + error!(@feedback, arg.span, "unexpected argument"); } $crate::Pass::new(func, feedback) @@ -189,7 +189,7 @@ macro_rules! body { (nope: $body:expr, $feedback:expr) => { if let Some(body) = $body { - $feedback.errors.push($crate::err!(body.span; "unexpected body")); + error!(@$feedback, body.span, "unexpected body"); } }; } -- cgit v1.2.3