diff options
| author | Laurenz <laurmaedje@gmail.com> | 2021-10-25 13:34:49 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2021-10-25 13:38:32 +0200 |
| commit | 3968181622694c4a15ae336049439b328649bca0 (patch) | |
| tree | 979093e93b49bfde47e54bc4475cedf24d12e3d8 /src/library/layout.rs | |
| parent | adf52a873f0cdff310c236998fc5018a886b339b (diff) | |
Replace `..` syntax with `range` function
Diffstat (limited to 'src/library/layout.rs')
| -rw-r--r-- | src/library/layout.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library/layout.rs b/src/library/layout.rs index d412af67..4b416156 100644 --- a/src/library/layout.rs +++ b/src/library/layout.rs @@ -6,7 +6,7 @@ use crate::style::{Paper, PaperClass}; /// `page`: Configure pages. pub fn page(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - let paper = match args.named::<Spanned<Str>>("paper")?.or_else(|| args.eat()) { + let paper = match args.named::<Spanned<Str>>("paper")?.or_else(|| args.find()) { Some(name) => match Paper::from_name(&name.v) { None => bail!(name.span, "invalid paper name"), paper => paper, @@ -80,9 +80,9 @@ pub fn pagebreak(_: &mut EvalContext, _: &mut Args) -> TypResult<Value> { /// `align`: Configure the alignment along the layouting axes. pub fn align(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - let first = args.eat::<Align>(); - let second = args.eat::<Align>(); - let body = args.eat::<Template>(); + let first = args.find::<Align>(); + let second = args.find::<Align>(); + let body = args.find::<Template>(); let mut horizontal = args.named("horizontal")?; let mut vertical = args.named("vertical")?; @@ -149,7 +149,7 @@ pub fn boxed(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { let width = args.named("width")?; let height = args.named("height")?; let fill = args.named("fill")?; - let body: Template = args.eat().unwrap_or_default(); + let body: Template = args.find().unwrap_or_default(); Ok(Value::Template(Template::from_inline(move |style| { ShapeNode { shape: ShapeKind::Rect, @@ -171,7 +171,7 @@ pub fn block(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { /// `pad`: Pad content at the sides. pub fn pad(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - let all = args.eat(); + let all = args.find(); let left = args.named("left")?; let top = args.named("top")?; let right = args.named("right")?; |
