summaryrefslogtreecommitdiff
path: root/src/layout
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-07-26 17:41:07 +0200
committerGitHub <noreply@github.com>2020-07-26 17:41:07 +0200
commite7ffdde43d09f60238590723c2829554806e23d5 (patch)
tree616ae4474f0dec5cc70fe3fa46b5f3c4b305a1be /src/layout
parent0e8c2cad6e4fee283f8f2d6fb9a571173b59fda2 (diff)
parente2ef4f64e777f293a0408d0f60cfed9de69c7bb6 (diff)
Merge pull request #5 from typst/problems-and-error-macro
Rename errors to problems and make error! macro more ergonomic
Diffstat (limited to 'src/layout')
-rw-r--r--src/layout/model.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/layout/model.rs b/src/layout/model.rs
index 2800774a..3f1c9e7a 100644
--- a/src/layout/model.rs
+++ b/src/layout/model.rs
@@ -245,8 +245,10 @@ impl<'a> ModelLayouter<'a> {
BreakParagraph => self.layout_paragraph(),
BreakPage => {
if self.ctx.nested {
- self.feedback.errors.push(err!(model_span;
- "page break cannot be issued from nested context"));
+ error!(
+ @self.feedback, model_span,
+ "page break cannot be issued from nested context",
+ );
} else {
self.layouter.finish_space(true)
}
@@ -258,8 +260,10 @@ impl<'a> ModelLayouter<'a> {
}
SetPageStyle(style) => {
if self.ctx.nested {
- self.feedback.errors.push(err!(model_span;
- "page style cannot be changed from nested context"));
+ error!(
+ @self.feedback, model_span,
+ "page style cannot be changed from nested context",
+ );
} else {
self.style.page = style;