From 88d3be258114d631f6e1381e756ff9bb8aba6b0e Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sun, 25 Jul 2021 23:41:04 +0200 Subject: [PATCH] Remove PageState::new --- src/exec/state.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/exec/state.rs b/src/exec/state.rs index be70cb67b..0145f60f7 100644 --- a/src/exec/state.rs +++ b/src/exec/state.rs @@ -5,7 +5,7 @@ use crate::color::{Color, RgbaColor}; use crate::font::{FontStretch, FontStyle, FontVariant, FontWeight, VerticalFontMetric}; use crate::geom::*; use crate::layout::Paint; -use crate::paper::{Paper, PaperClass, PAPER_A4}; +use crate::paper::{PaperClass, PAPER_A4}; /// The execution state. #[derive(Debug, Clone, Eq, PartialEq, Hash)] @@ -51,16 +51,7 @@ pub struct PageState { } impl PageState { - /// The default page style for the given paper. - pub fn new(paper: Paper) -> Self { - Self { - class: paper.class, - size: paper.size(), - margins: Sides::splat(None), - } - } - - /// The margins. + /// The resolved margins. pub fn margins(&self) -> Sides { let default = self.class.default_margins(); Sides { @@ -74,7 +65,12 @@ impl PageState { impl Default for PageState { fn default() -> Self { - Self::new(PAPER_A4) + let paper = PAPER_A4; + Self { + class: paper.class, + size: paper.size(), + margins: Sides::splat(None), + } } }