Eliminating need for call to as_pdf_line() in push_shape()

src/bin/weekly.rs

@@ -100,7 +100,7 @@ impl<F: Fn(&WRect, usize, &mut Instructions)> GridDescription for SimpleDescript
 
         if row == 0 {
             instructions.set_fill_color(Colors::black());
-            instructions.push_shape(cell_rect.as_pdf_line());
+            instructions.push_shape(cell_rect);
 
             instructions.set_fill_color(Colors::white());
             instructions.push_text(
@@ -146,7 +146,7 @@ fn render_left_circle(rect: &WRect, instructions: &mut Instructions) {
     let y = rect.bottom_q1() + radius;
 
     let circle = Circle::at_zero(radius - 1.15.mm()).move_to(x, y);
-    instructions.push_shape(circle.as_pdf_line());
+    instructions.push_shape(circle);
 }
 
 fn render_days(rect: &WRect) -> Result<Instructions> {
@@ -235,7 +235,7 @@ fn render_weekly(_: &PdfDocumentReference, page_rect: &WRect) -> Result<Instruct
                 for i in 0..7 {
                     let l = small_grid_left + rect.height() * i;
                     let wline = WLine::line(l, rect.bottom_q1(), l, rect.top());
-                    instructions.push_shape(wline.as_pdf_line())
+                    instructions.push_shape(wline)
                 }
                 instructions.pop_state();
             } else {

src/pdfutils.rs

@@ -1,5 +1,5 @@
 use crate::units::Unit;
-use crate::{Result, WRect};
+use crate::{AsPdfLine, Result, WRect};
 use printpdf::*;
 use std::collections::HashMap;
 use std::fs::File;
@@ -37,8 +37,9 @@ impl Instructions {
         self.instructions.push(Instruction::Translate(x, y));
     }
 
-    pub fn push_shape(&mut self, shape: Line) {
-        self.instructions.push(Instruction::Shape(shape));
+    pub fn push_shape(&mut self, shape: impl AsPdfLine) {
+        self.instructions
+            .push(Instruction::Shape(shape.as_pdf_line()))
     }
 
     pub fn push_text(&mut self, s: &str, text_height: f64, x: Unit, y: Unit, font: FontProxy) {

src/shapes/mod.rs

@@ -7,3 +7,9 @@ pub(crate) mod rect;
 pub trait AsPdfLine {
     fn as_pdf_line(&self) -> Line;
 }
+
+impl AsPdfLine for Line {
+    fn as_pdf_line(&self) -> Line {
+        self.clone()
+    }
+}

src/shapes/rect.rs

@@ -140,3 +140,10 @@ impl AsPdfLine for WRect {
         }
     }
 }
+
+impl AsPdfLine for &WRect {
+    fn as_pdf_line(&self) -> Line {
+        // TODO: Can I eliminate this clone?
+        (*self).clone().as_pdf_line()
+    }
+}