From 30f7d39ca2ed4590b5d356b1a4c024d11156a383 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sun, 25 Dec 2022 15:46:31 +0100
Subject: WIP before core rewrite

---
 core/src/core_shapes.rs | 2 +-
 core/src/solving.rs     | 6 +++---
 core/src/styles.rs      | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'core')

diff --git a/core/src/core_shapes.rs b/core/src/core_shapes.rs
index c3d3cae..805d82e 100644
--- a/core/src/core_shapes.rs
+++ b/core/src/core_shapes.rs
@@ -30,7 +30,7 @@ pub struct Rectangle {}
 
 impl CoreShape for Rectangle {
     fn to_render(&self, _model: &dyn SolverModel) -> Option<Box<dyn Render>> {
-        Some(Box::new(self.clone()))
+        Some(Box::new(*self))
     }
 }
 
diff --git a/core/src/solving.rs b/core/src/solving.rs
index c7e94ba..4760611 100644
--- a/core/src/solving.rs
+++ b/core/src/solving.rs
@@ -196,7 +196,7 @@ impl Constrainable for StrokeStyle {
         };
 
         Some(DefinedStrokeStyle {
-            pattern: self.pattern.clone(),
+            pattern: self.pattern,
             dash,
             line_width: self.line_width.fixate(model)?,
         })
@@ -249,7 +249,7 @@ impl Constrainable for FontDescription {
             family: self.family.clone(),
             style: self.style,
             weight: self.weight,
-            size: self.size.fixate(&*model)?,
+            size: self.size.fixate(model)?,
         })
     }
 }
@@ -260,7 +260,7 @@ impl Constrainable for Text {
     fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
         Some(DefinedText {
             content: self.content.clone(),
-            font: self.font.fixate(&*model)?,
+            font: self.font.fixate(model)?,
         })
     }
 }
diff --git a/core/src/styles.rs b/core/src/styles.rs
index c061c58..73373ba 100644
--- a/core/src/styles.rs
+++ b/core/src/styles.rs
@@ -10,10 +10,7 @@ pub enum Pattern {
 
 impl Pattern {
     pub fn is_none(&self) -> bool {
-        match self {
-            Pattern::None => true,
-            _ => false,
-        }
+        matches!(self, Pattern::None)
     }
 }
 
@@ -97,7 +94,7 @@ impl StrokeStyleBuilder {
 
     pub fn build(&mut self) -> StrokeStyle {
         StrokeStyle {
-            pattern: self.pattern.clone().unwrap_or_default(),
+            pattern: self.pattern.unwrap_or_default(),
             dash: self.dash.clone(),
             line_width: self.line_width.unwrap_or(Float::Fixed(2.)),
         }
-- 
cgit v1.2.3