From d3bc4ec07349a96c3863ddce63c2e52b5e7e9f2f Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sun, 11 Oct 2020 22:38:30 +0200
Subject: =?UTF-8?q?Refactor=20layouting=20base=20=F0=9F=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/library/boxed.rs | 10 ++++++----
 src/library/page.rs  |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/library')

diff --git a/src/library/boxed.rs b/src/library/boxed.rs
index 0c1ed30a..0045b0bd 100644
--- a/src/library/boxed.rs
+++ b/src/library/boxed.rs
@@ -1,5 +1,5 @@
 use crate::geom::Linear;
-use crate::layout::{Fixed, Stack};
+use crate::layout::{Expansion, Fixed, Stack};
 use crate::prelude::*;
 
 /// `box`: Layouts its contents into a box.
@@ -20,9 +20,7 @@ pub fn boxed(mut args: Args, ctx: &mut EvalContext) -> Value {
 
     ctx.start_group(());
     ctx.start_par_group();
-
     body.eval(ctx);
-
     ctx.end_par_group();
     let ((), children) = ctx.end_group();
 
@@ -33,7 +31,11 @@ pub fn boxed(mut args: Args, ctx: &mut EvalContext) -> Value {
             dirs,
             children,
             aligns,
-            expand: Spec::new(width.is_some(), height.is_some()),
+            expansion: Spec::new(
+                Expansion::fill_if(width.is_some()),
+                Expansion::fill_if(height.is_some()),
+            )
+            .switch(dirs),
         }),
     });
 
diff --git a/src/library/page.rs b/src/library/page.rs
index 570dbb10..efb40f10 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -1,5 +1,3 @@
-use std::mem;
-
 use crate::geom::{Length, Linear};
 use crate::paper::{Paper, PaperClass};
 use crate::prelude::*;
@@ -56,7 +54,7 @@ pub fn page(mut args: Args, ctx: &mut EvalContext) -> Value {
 
     if args.get::<_, bool>(ctx, "flip").unwrap_or(false) {
         let size = &mut ctx.state.page.size;
-        mem::swap(&mut size.width, &mut size.height);
+        std::mem::swap(&mut size.width, &mut size.height);
     }
 
     args.done(ctx);
-- 
cgit v1.2.3