diff options
| author | Laurenz <laurmaedje@gmail.com> | 2020-10-05 15:45:45 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2020-10-05 15:45:45 +0200 |
| commit | fa3e2920c0be01874ba40eebc87ed30f97cdeec7 (patch) | |
| tree | d1d7d4123f10c57efbb30d07d68eb4e675c3f438 /src/library | |
| parent | 2df8b964d0e6f40451183c207a20d0273907a524 (diff) | |
Remove @ syntax in diagnostics macros 🗑
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/align.rs | 10 | ||||
| -rw-r--r-- | src/library/color.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/library/align.rs b/src/library/align.rs index eaef4d87..ba5de18a 100644 --- a/src/library/align.rs +++ b/src/library/align.rs @@ -53,12 +53,12 @@ fn parse_aligns( // `deferred_center` to true and handle the situation once we know more. if let Some(axis) = axis { if align.v.axis().map_or(false, |a| a != axis) { - error!( - @ctx.f, align.span, + ctx.diag(error!( + align.span, "invalid alignment {} for {} axis", align.v, axis, - ); + )); } else if had[axis as usize] { - error!(@ctx.f, align.span, "duplicate alignment for {} axis", axis); + ctx.diag(error!(align.span, "duplicate alignment for {} axis", axis)); } else { let gen_align = align.v.to_gen(ctx.state.sys); *aligns.get_mut(axis.to_gen(ctx.state.sys)) = gen_align; @@ -66,7 +66,7 @@ fn parse_aligns( } } else { if had == [true, true] { - error!(@ctx.f, align.span, "duplicate alignment"); + ctx.diag(error!(align.span, "duplicate alignment")); } else if deferred_center { // We have two unflushed centers, meaning we know that both axes // are to be centered. diff --git a/src/library/color.rs b/src/library/color.rs index a4958c53..261352ba 100644 --- a/src/library/color.rs +++ b/src/library/color.rs @@ -12,7 +12,7 @@ pub async fn rgb(mut args: Args, ctx: &mut LayoutContext) -> Value { let mut clamp = |component: Option<Spanned<i64>>, default| { component.map_or(default, |c| { if c.v < 0 || c.v > 255 { - error!(@ctx.f, c.span, "should be between 0 and 255") + ctx.diag(error!(c.span, "should be between 0 and 255")); } c.v.max(0).min(255) as u8 }) |