From 6761cbc622c38e98a431aaee5272f8c0123e0d60 Mon Sep 17 00:00:00 2001
From: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com>
Date: Sun, 15 Dec 2024 22:34:48 +0100
Subject: [PATCH] Put trait into primitive

---
 crates/typst-pdf/src/krilla.rs    |  4 ++--
 crates/typst-pdf/src/lib.rs       | 12 ------------
 crates/typst-pdf/src/paint.rs     |  3 +--
 crates/typst-pdf/src/primitive.rs | 15 +++++++++++++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/crates/typst-pdf/src/krilla.rs b/crates/typst-pdf/src/krilla.rs
index 814f1f7fd..952a92528 100644
--- a/crates/typst-pdf/src/krilla.rs
+++ b/crates/typst-pdf/src/krilla.rs
@@ -1,5 +1,5 @@
-use crate::primitive::{PointExt, SizeExt, TransformExt};
-use crate::{paint, AbsExt, PdfOptions};
+use crate::primitive::{AbsExt, PointExt, SizeExt, TransformExt};
+use crate::{paint, PdfOptions};
 use bytemuck::TransparentWrapper;
 use ecow::EcoString;
 use krilla::action::{Action, LinkAction};
diff --git a/crates/typst-pdf/src/lib.rs b/crates/typst-pdf/src/lib.rs
index b27cf7780..3596bf73e 100644
--- a/crates/typst-pdf/src/lib.rs
+++ b/crates/typst-pdf/src/lib.rs
@@ -50,15 +50,3 @@ pub struct PdfOptions<'a> {
     /// A standard the PDF should conform to.
     pub validator: Validator,
 }
-
-/// Additional methods for [`Abs`].
-trait AbsExt {
-    /// Convert an to a number of points.
-    fn to_f32(self) -> f32;
-}
-
-impl AbsExt for Abs {
-    fn to_f32(self) -> f32 {
-        self.to_pt() as f32
-    }
-}
diff --git a/crates/typst-pdf/src/paint.rs b/crates/typst-pdf/src/paint.rs
index c4978b193..1e7a16b04 100644
--- a/crates/typst-pdf/src/paint.rs
+++ b/crates/typst-pdf/src/paint.rs
@@ -1,8 +1,7 @@
 //! Convert paint types from typst to krilla.
 
 use crate::krilla::{process_frame, FrameContext, GlobalContext, Transforms};
-use crate::primitive::{FillRuleExt, LineCapExt, LineJoinExt, TransformExt};
-use crate::AbsExt;
+use crate::primitive::{AbsExt, FillRuleExt, LineCapExt, LineJoinExt, TransformExt};
 use krilla::geom::NormalizedF32;
 use krilla::page::{NumberingStyle, PageLabel};
 use krilla::paint::SpreadMethod;
diff --git a/crates/typst-pdf/src/primitive.rs b/crates/typst-pdf/src/primitive.rs
index bd2770332..3ccc51845 100644
--- a/crates/typst-pdf/src/primitive.rs
+++ b/crates/typst-pdf/src/primitive.rs
@@ -1,9 +1,8 @@
 //! Convert basic primitive types from typst to krilla.
 
-use typst_library::layout::{Point, Size, Transform};
+use typst_library::layout::{Abs, Point, Size, Transform};
 use typst_library::visualize::{FillRule, LineCap, LineJoin};
 
-use crate::AbsExt;
 
 pub(crate) trait SizeExt {
     fn as_krilla(&self) -> krilla::geom::Size;
@@ -82,3 +81,15 @@ impl FillRuleExt for FillRule {
         }
     }
 }
+
+/// Additional methods for [`Abs`].
+pub(crate) trait AbsExt {
+    /// Convert an to a number of points.
+    fn to_f32(self) -> f32;
+}
+
+impl AbsExt for Abs {
+    fn to_f32(self) -> f32 {
+        self.to_pt() as f32
+    }
+}