From 63cfcbe7a7745b276de58ec92e0141b958c44feb Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 10 Aug 2024 19:06:46 +0200 Subject: use unsafe blocks instead of mutexes --- src/config/theme/view/bar.rs | 3 +-- src/config/theme/view/mod.rs | 16 +++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'src/config/theme/view') 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| { - 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| { - 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| { - 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| { - cfg_mut!().background = background; + cfg!().background = background; Ok(()) }); -- cgit v1.2.3-70-g09d2