code cleanup

4 files changed, 16 insertions, 18 deletions

diff --git a/src/sheet/loader/mod.rs b/src/sheet/loader/mod.rs
index 0e083fe..6f731db 100644
--- a/src/sheet/loader/mod.rs
+++ b/src/sheet/loader/mod.rs
@@ -35,7 +35,7 @@ impl Loader {
             };
         }
 
-        return None;
+        None
     }
 
     pub fn add(&mut self, extension: String, func: Box<dyn Runnable<String, Tablized>>) {
@@ -43,7 +43,7 @@ impl Loader {
     }
 
     pub fn get() -> &'static mut Self {
-        static mut GLOBAL_LOADER: Lazy<Loader> = Lazy::new(|| Loader::new());
+        static mut GLOBAL_LOADER: Lazy<Loader> = Lazy::new(Loader::new);
         unsafe { &mut *addr_of_mut!(GLOBAL_LOADER) }
     }
 }
diff --git a/src/sheet/loader/native/csv.rs b/src/sheet/loader/native/csv.rs
index 4a8f05d..6f81645 100644
--- a/src/sheet/loader/native/csv.rs
+++ b/src/sheet/loader/native/csv.rs
@@ -9,10 +9,8 @@ pub fn load_csv(path: String) -> Tablized {
 
     let mut table = Vec::new();
 
-    for result in csv_reader.records() {
-        if let Ok(record) = result {
-            table.push(record.iter().map(|s| Cell::from(s)).collect::<Vec<Cell>>())
-        }
+    for record in csv_reader.records().flatten() {
+        table.push(record.iter().map(Cell::from).collect::<Vec<Cell>>())
     }
 
     Tablized::Vector(table)
diff --git a/src/widgets/luaeditor/mod.rs b/src/widgets/luaeditor/mod.rs
index d553734..889b8d4 100644
--- a/src/widgets/luaeditor/mod.rs
+++ b/src/widgets/luaeditor/mod.rs
@@ -93,14 +93,14 @@ impl Widget for &mut LuaEditor {
 
             theme
                 .background
-                .get((), &lua::get())
+                .get((), lua::get())
                 .unwrap_or_default()
                 .apply(Paragraph::default())
                 .render(area, buf);
 
             theme
                 .cursor_line
-                .get((), &lua::get())
+                .get((), lua::get())
                 .unwrap_or_default()
                 .apply(Paragraph::default())
                 .render(
@@ -147,10 +147,10 @@ impl Widget for &mut LuaEditor {
                 if buffer.cursor().y() == i {
                     theme
                         .active_line_number
-                        .get((), &lua::get())
+                        .get((), lua::get())
                         .unwrap_or_default()
                 } else {
-                    theme.line_number.get((), &lua::get()).unwrap_or_default()
+                    theme.line_number.get((), lua::get()).unwrap_or_default()
                 }
                 .apply(((i + 1).to_string() + " ").to_line())
                 .right_aligned()
@@ -158,8 +158,8 @@ impl Widget for &mut LuaEditor {
             }
         }
 
-        EditorBarState::apply(&mut self.bar, (), &lua::get());
-        EditorBarTheme::apply(&mut self.bar, (), &lua::get());
+        EditorBarState::apply(&mut self.bar, (), lua::get());
+        EditorBarTheme::apply(&mut self.bar, (), lua::get());
         self.bar.render(area, buf);
     }
 }
diff --git a/src/widgets/sheetview/mod.rs b/src/widgets/sheetview/mod.rs
index 9b6b5bd..0c5b3d5 100644
--- a/src/widgets/sheetview/mod.rs
+++ b/src/widgets/sheetview/mod.rs
@@ -95,7 +95,7 @@ impl Widget for &mut SheetView {
 
             theme
                 .background
-                .get((), &lua::get())
+                .get((), lua::get())
                 .unwrap_or_default()
                 .apply(Paragraph::default())
                 .render(sheet_area_inner, buf);
@@ -110,19 +110,19 @@ impl Widget for &mut SheetView {
                         let line = if (cell_pos_y, cell_pos_x) == (cursor.y(), cursor.x()) {
                             theme
                                 .cursor
-                                .get(cell_ref, &lua::get())
+                                .get(cell_ref, lua::get())
                                 .unwrap_or_default()
                                 .apply(cell.to_line())
                         } else if state.view.selection_contains(cell_pos_y, cell_pos_x) {
                             theme
                                 .selection
-                                .get(cell_ref, &lua::get())
+                                .get(cell_ref, lua::get())
                                 .unwrap_or_default()
                                 .apply(cell.to_line())
                         } else {
                             theme
                                 .cell
-                                .get(cell_ref, &lua::get())
+                                .get(cell_ref, lua::get())
                                 .unwrap_or_default()
                                 .apply(cell.to_line())
                         };
@@ -143,8 +143,8 @@ impl Widget for &mut SheetView {
             state.view.mode
         };
 
-        SheetViewBarState::apply(&mut self.bar, mode, &lua::get());
-        SheetViewBarTheme::apply(&mut self.bar, mode, &lua::get());
+        SheetViewBarState::apply(&mut self.bar, mode, lua::get());
+        SheetViewBarTheme::apply(&mut self.bar, mode, lua::get());
         self.bar.render(area, buf);
     }
 }