to_pdf_line() now takes a ref.

gmadrid · Jan 6, 2023 · fc16555 · fc16555
1 parent a18ddb1
commit fc16555
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/shapes/circle.rs b/src/shapes/circle.rs
@@ -52,7 +52,7 @@ impl AsMut<RenderAttrsImpl> for Circle {
 }
 
 impl ToPlainPdfLine for Circle {
-    fn to_plain_pdf_line(self) -> Line {
+    fn to_plain_pdf_line(&self) -> Line {
         Line {
             points: printpdf::calculate_points_for_circle(self.radius, self.x, self.y),
             is_closed: true,

diff --git a/src/shapes/line.rs b/src/shapes/line.rs
@@ -38,7 +38,7 @@ impl AsMut<RenderAttrsImpl> for WLine {
 }
 
 impl ToPlainPdfLine for WLine {
-    fn to_plain_pdf_line(self) -> Line {
+    fn to_plain_pdf_line(&self) -> Line {
         Line {
             points: vec![
                 point_pair(self.x1, self.y1, false),

diff --git a/src/shapes/mod.rs b/src/shapes/mod.rs
@@ -82,22 +82,20 @@ impl<T: AsMut<RenderAttrsImpl> + AsRef<RenderAttrsImpl>> HasRenderAttrs for T {
 trait ToPlainPdfLine {
     /// Converts a shape into an (unstroke, unfilled) printpdf::line.
     /// The implementor is responsible for setting the 'closed' flag.
-    // TODO: consider making this take &self and rename to AsPlainPdfLine.
-    fn to_plain_pdf_line(self) -> Line;
+    fn to_plain_pdf_line(&self) -> Line;
 }
 
 pub trait ToPdfLine {
     /// Converts a shape into a printpdf::Line that is marked for rendering as a stroke
     /// or a filled shape (or both).
-    // TODO: consider making this take &self and rename to AsPdfLine.
-    fn to_pdf_line(self) -> Line;
+    fn to_pdf_line(&self) -> Line;
 }
 
 impl<T> ToPdfLine for T
 where
     T: ToPlainPdfLine + HasRenderAttrs,
 {
-    fn to_pdf_line(self) -> Line {
+    fn to_pdf_line(&self) -> Line {
         // TODO: Do you want to check that plain pdf line is unstroked and unfilled?
         let stroked = self.is_stroked();
         let filled = self.is_filled();
@@ -114,7 +112,8 @@ where
 }
 
 impl ToPdfLine for Line {
-    fn to_pdf_line(self) -> Line {
-        self
+    fn to_pdf_line(&self) -> Line {
+        // TODO: make this thing go awqy! I think it's only used for rounded rects.
+        self.clone()
     }
 }
diff --git a/src/shapes/rect.rs b/src/shapes/rect.rs
@@ -142,7 +142,7 @@ impl AsMut<RenderAttrsImpl> for WRect {
 }
 
 impl ToPlainPdfLine for WRect {
-    fn to_plain_pdf_line(self) -> Line {
+    fn to_plain_pdf_line(&self) -> Line {
         Line {
             // In Q1, rects grow downward toward the bottom.
             points: vec![