From 90cd4e81df0fe61244a260d4559c1acfa7f63483 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@gmail.com>
Date: Tue, 8 Mar 2022 08:48:45 -0500
Subject: [PATCH] cleanup

---
 src/egui_app.rs |  7 +++----
 src/function.rs | 12 +++---------
 src/lib.rs      |  2 --
 src/parsing.rs  |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/egui_app.rs b/src/egui_app.rs
index b50d2d3..b1ad14e 100644
--- a/src/egui_app.rs
+++ b/src/egui_app.rs
@@ -525,17 +525,16 @@ impl epi::App for MathApp {
 
                             if let Some(bars_data) = bars {
                                 let (integral_bar, integral_line, area) = bars_data;
+                                let integral_name = format!("Integral of {}", func_str);
                                 match self.settings.integral_display_type {
                                     IntegralDisplay::Rectangles => plot_ui.bar_chart(
                                         integral_bar
                                             .color(Color32::BLUE)
                                             .width(step)
-                                            .name(format!("Integral of {}", func_str)),
+                                            .name(integral_name),
                                     ),
                                     IntegralDisplay::Line => plot_ui.line(
-                                        integral_line
-                                            .color(Color32::BLUE)
-                                            .name(format!("Integral of {}", func_str)),
+                                        integral_line.color(Color32::BLUE).name(integral_name),
                                     ),
                                 }
                                 digits_precision(area, 8)
diff --git a/src/function.rs b/src/function.rs
index bb9b56e..754350d 100644
--- a/src/function.rs
+++ b/src/function.rs
@@ -377,9 +377,7 @@ fn left_function_test() {
         assert_eq!(bars.clone().unwrap().2, area_target);
         let bars_unwrapped = bars.unwrap();
 
-        let vec_bars: Vec<f64> = bars_unwrapped.0.iter().map(|bar| bar.value).collect();
-
-        assert_eq!(vec_bars.len(), integral_num);
+        assert_eq!(bars_unwrapped.0.iter().len(), integral_num);
 
         let integral_line = bars_unwrapped.1;
         let vec_integral: Vec<(f64, f64)> =
@@ -453,9 +451,7 @@ fn middle_function_test() {
         assert_eq!(bars.clone().unwrap().2, area_target);
         let bars_unwrapped = bars.unwrap();
 
-        let vec_bars: Vec<f64> = bars_unwrapped.0.iter().map(|bar| bar.value).collect();
-
-        assert_eq!(vec_bars.len(), integral_num);
+        assert_eq!(bars_unwrapped.0.iter().len(), integral_num);
 
         let integral_line = bars_unwrapped.1;
         let vec_integral: Vec<(f64, f64)> =
@@ -529,9 +525,7 @@ fn right_function_test() {
         assert_eq!(bars.clone().unwrap().2, area_target);
         let bars_unwrapped = bars.unwrap();
 
-        let vec_bars: Vec<f64> = bars_unwrapped.0.iter().map(|bar| bar.value).collect();
-
-        assert_eq!(vec_bars.len(), integral_num);
+        assert_eq!(bars_unwrapped.0.iter().len(), integral_num);
 
         let integral_line = bars_unwrapped.1;
         let vec_integral: Vec<(f64, f64)> =
diff --git a/src/lib.rs b/src/lib.rs
index 6e11455..f8507b7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,8 +5,6 @@ mod egui_app;
 mod function;
 mod misc;
 mod parsing;
-#[macro_use]
-extern crate lazy_static;
 
 cfg_if::cfg_if! {
     if #[cfg(target_arch = "wasm32")] {
diff --git a/src/parsing.rs b/src/parsing.rs
index 77ea0f6..1ce2ce4 100644
--- a/src/parsing.rs
+++ b/src/parsing.rs
@@ -9,7 +9,7 @@ pub struct BackingFunction {
 impl BackingFunction {
     pub fn new(func_str: &str) -> Self {
         let function = exmex::parse::<f64>(func_str).unwrap();
-        let derivative_1 = function.partial(0).unwrap_or(function.clone());
+        let derivative_1 = function.partial(0).unwrap_or_else(|_| function.clone());
         // let derivative_2 = function.partial(0).unwrap_or(derivative_1.clone());
 
         Self {