improv: Make more use of DerefCell

Author: ids1024

src/application/keyboard_layer.rs

@@ -8,9 +8,8 @@ use std::{
     f64::consts::PI,
     rc::Rc,
 };
-use once_cell::unsync::OnceCell;
 
-use crate::Rgb;
+use crate::{DerefCell, Rgb};
 use super::{Key, Page};
 
 const SCALE: f64 = 64.0;
@@ -20,7 +19,7 @@ const RADIUS: f64 = 4.;
 #[derive(Default)]
 pub struct KeyboardLayerInner {
     page: Cell<Page>,
-    keys: OnceCell<Rc<[Key]>>,
+    keys: DerefCell<Rc<[Key]>>,
     selected: Cell<Option<usize>>,
     selectable: Cell<bool>,
 }
@@ -186,7 +185,7 @@ impl KeyboardLayer {
         obj.set_size_request(width, height);
 
         obj.inner().page.set(page);
-        obj.inner().keys.set(keys).unwrap();
+        obj.inner().keys.set(keys);
 
         obj
     }
@@ -200,7 +199,7 @@ impl KeyboardLayer {
     }
 
     pub fn keys(&self) -> &[Key] {
-        self.inner().keys.get().unwrap()
+        &self.inner().keys
     }
 
     pub fn selected(&self) -> Option<usize> {

src/application/mod.rs

@@ -2,7 +2,6 @@ use cascade::cascade;
 use glib::subclass;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use once_cell::unsync::OnceCell;
 
 mod about_dialog;
 mod error_dialog;
@@ -16,6 +15,8 @@ mod picker;
 mod rect;
 mod shortcuts_window;
 
+use crate::DerefCell;
+
 use self::{
     error_dialog::*,
     key::*,
@@ -29,8 +30,9 @@ use self::{
     shortcuts_window::*,
 };
 
+#[derive(Default)]
 pub struct ConfiguratorAppInner {
-    phony_board_names: OnceCell<Vec<String>>,
+    phony_board_names: DerefCell<Vec<String>>,
 }
 
 impl ObjectSubclass for ConfiguratorAppInner {
@@ -46,9 +48,7 @@ impl ObjectSubclass for ConfiguratorAppInner {
     glib::object_subclass!();
 
     fn new() -> Self {
-        Self {
-            phony_board_names: OnceCell::new(),
-        }
+        Self::default()
     }
 }
 
@@ -76,7 +76,7 @@ impl ApplicationImpl for ConfiguratorAppInner {
             vec![]
         };
 
-        let _ = self.phony_board_names.set(board_names);
+        self.phony_board_names.set(board_names);
         -1
     }
 
@@ -105,7 +105,7 @@ impl ApplicationImpl for ConfiguratorAppInner {
             eprintln!("Focusing current window");
             window.present();
         } else {
-            let phony_board_names = self.phony_board_names.get().unwrap();
+            let phony_board_names = &*self.phony_board_names;
             let window = MainWindow::new(phony_board_names.clone());
             app.add_window(&window);
         }

src/keyboard_color_button.rs

@@ -3,13 +3,13 @@ use glib::clone;
 use glib::subclass;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use once_cell::unsync::OnceCell;
 use std::{cell::{Cell, RefCell}, iter};
 
 use crate::{
     choose_color,
     ColorCircle,
     DaemonBoard,
+    DerefCell,
     Rgb,
 };
 
@@ -29,7 +29,7 @@ pub struct KeyboardColorButtonInner {
     edit_button: TemplateChild<gtk::Button>,
     #[template_child]
     popover: TemplateChild<gtk::Popover>,
-    board: OnceCell<DaemonBoard>,
+    board: DerefCell<DaemonBoard>,
     rgb: Cell<Rgb>,
 }
 
@@ -135,7 +135,7 @@ impl KeyboardColorButton {
                 Rgb::new(0, 0, 0)
             }
         });
-        let _ = keyboard_color_button.inner().board.set(board);
+        keyboard_color_button.inner().board.set(board);
 
         // TODO: Signal handler for color change?
 
@@ -252,7 +252,7 @@ impl KeyboardColorButton {
     }
 
     fn board(&self) -> &DaemonBoard {
-        self.inner().board.get().unwrap()
+        &self.inner().board
     }
 
     fn set_rgb(&self, rgb: Rgb) {