use unsafe blocks instead of mutexes

5 files changed, 17 insertions, 31 deletions

diff --git a/src/config/theme/bar.rs b/src/config/theme/bar.rs
index a28bede..59b6c00 100644
--- a/src/config/theme/bar.rs
+++ b/src/config/theme/bar.rs
@@ -1,5 +1,5 @@
 macro_rules! BarTheme {
-    ($name:ident, $type:ty, $cfg:expr, $cfg_mut:expr) => {
+    ($name:ident, $type:ty, $cfg:expr) => {
         use crate::config::theme::style::Style;
         use crate::lua::evalsto::EvalTo;
         use crate::widgets::statusbar::StatusBar;
@@ -38,19 +38,19 @@ macro_rules! BarTheme {
             fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) {
                 fields.add_field_function_get("left", |_, _| Ok($cfg.left.clone()));
                 fields.add_field_function_set("left", |_, _, style: EvalTo<Style, $type>| {
-                    $cfg_mut.left = style;
+                    $cfg.left = style;
                     Ok(())
                 });
 
                 fields.add_field_function_get("middle", |_, _| Ok($cfg.middle.clone()));
                 fields.add_field_function_set("middle", |_, _, style: EvalTo<Style, $type>| {
-                    $cfg_mut.middle = style;
+                    $cfg.middle = style;
                     Ok(())
                 });
 
                 fields.add_field_function_get("right", |_, _| Ok($cfg.right.clone()));
                 fields.add_field_function_set("right", |_, _, style: EvalTo<Style, $type>| {
-                    $cfg_mut.right = style;
+                    $cfg.right = style;
                     Ok(())
                 });
             }
diff --git a/src/config/theme/editor/bar.rs b/src/config/theme/editor/bar.rs
index 62be7b0..e0ff0a7 100644
--- a/src/config/theme/editor/bar.rs
+++ b/src/config/theme/editor/bar.rs
@@ -3,6 +3,5 @@ use crate::config::{theme::bar::BarTheme, GlobalConfig};
 BarTheme!(
     EditorBarTheme,
     (),
-    GlobalConfig::instance().theme.editor.bar,
-    GlobalConfig::instance_mut().theme.editor.bar
+    GlobalConfig::get().theme.editor.bar
 );
diff --git a/src/config/theme/editor/mod.rs b/src/config/theme/editor/mod.rs
index 662dacc..33ab600 100644
--- a/src/config/theme/editor/mod.rs
+++ b/src/config/theme/editor/mod.rs
@@ -36,13 +36,7 @@ impl EditorTheme {
 
 macro_rules! cfg {
     () => {
-        GlobalConfig::instance().theme.editor
-    };
-}
-
-macro_rules! cfg_mut {
-    () => {
-        GlobalConfig::instance_mut().theme.editor
+        GlobalConfig::get().theme.editor
     };
 }
 
@@ -50,25 +44,25 @@ impl UserData for EditorTheme {
     fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) {
         fields.add_field_function_get("background", |_, _| Ok(cfg!().background.clone()));
         fields.add_field_function_set("background", |_, _, background: EvalTo<Style, ()>| {
-            cfg_mut!().background = background;
+            cfg!().background = background;
             Ok(())
         });
 
         fields.add_field_function_get("highlight", |_, _| Ok(cfg!().highlight.clone()));
         fields.add_field_function_set("highlight", |_, _, highlight: HighlightTheme| {
-            cfg_mut!().highlight = highlight;
+            cfg!().highlight = highlight;
             Ok(())
         });
 
         fields.add_field_function_get("cursor_line", |_, _| Ok(cfg!().cursor_line.clone()));
         fields.add_field_function_set("cursor_line", |_, _, cursor_line: EvalTo<Style, ()>| {
-            cfg_mut!().cursor_line = cursor_line;
+            cfg!().cursor_line = cursor_line;
             Ok(())
         });
 
         fields.add_field_function_get("line_number", |_, _| Ok(cfg!().line_number.clone()));
         fields.add_field_function_set("line_number", |_, _, line_number: EvalTo<Style, ()>| {
-            cfg_mut!().line_number = line_number;
+            cfg!().line_number = line_number;
             Ok(())
         });
 
@@ -78,7 +72,7 @@ impl UserData for EditorTheme {
         fields.add_field_function_set(
             "active_line_number",
             |_, _, active_line_number: EvalTo<Style, ()>| {
-                cfg_mut!().active_line_number = active_line_number;
+                cfg!().active_line_number = active_line_number;
                 Ok(())
             },
         );
diff --git a/src/config/theme/view/bar.rs b/src/config/theme/view/bar.rs
index 7fab31a..c2d759b 100644
--- a/src/config/theme/view/bar.rs
+++ b/src/config/theme/view/bar.rs
@@ -4,6 +4,5 @@ use crate::{config::GlobalConfig, state::view::mode::Mode};
 BarTheme!(
     SheetViewBarTheme,
     Mode,
-    GlobalConfig::instance().theme.view.bar,
-    GlobalConfig::instance_mut().theme.view.bar
+    GlobalConfig::get().theme.view.bar
 );
diff --git a/src/config/theme/view/mod.rs b/src/config/theme/view/mod.rs
index e88e9ad..931e7dd 100644
--- a/src/config/theme/view/mod.rs
+++ b/src/config/theme/view/mod.rs
@@ -32,13 +32,7 @@ impl SheetViewTheme {
 
 macro_rules! cfg {
     () => {
-        GlobalConfig::instance().theme.view
-    };
-}
-
-macro_rules! cfg_mut {
-    () => {
-        GlobalConfig::instance_mut().theme.view
+        GlobalConfig::get().theme.view
     };
 }
 
@@ -47,25 +41,25 @@ impl UserData for SheetViewTheme {
         fields.add_field_function_get("cursor", |_, _| Ok(cfg!().cursor.clone()));
 
         fields.add_field_function_set("cursor", |_, _, pair: EvalTo<Style, CellRef>| {
-            cfg_mut!().cursor = pair;
+            cfg!().cursor = pair;
             Ok(())
         });
 
         fields.add_field_function_get("selection", |_, _| Ok(cfg!().selection.clone()));
         fields.add_field_function_set("selection", |_, _, pair: EvalTo<Style, CellRef>| {
-            cfg_mut!().selection = pair;
+            cfg!().selection = pair;
             Ok(())
         });
 
         fields.add_field_function_get("cell", |_, _| Ok(cfg!().cell.clone()));
         fields.add_field_function_set("cell", |_, _, cell: EvalTo<Style, CellRef>| {
-            cfg_mut!().cell = cell;
+            cfg!().cell = cell;
             Ok(())
         });
 
         fields.add_field_function_get("background", |_, _| Ok(cfg!().background.clone()));
         fields.add_field_function_set("background", |_, _, background: EvalTo<Style, ()>| {
-            cfg_mut!().background = background;
+            cfg!().background = background;
             Ok(())
         });