From 976ea0282d373c4d08187a78a7b46a09d66f7918 Mon Sep 17 00:00:00 2001 From: nc Date: Wed, 5 Aug 2020 23:56:06 -0400 Subject: revert --- src/app/impl_self.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/app/impl_self.rs') diff --git a/src/app/impl_self.rs b/src/app/impl_self.rs index c2a24cf..744f906 100644 --- a/src/app/impl_self.rs +++ b/src/app/impl_self.rs @@ -5,7 +5,6 @@ use std::io::prelude::*; use std::path::PathBuf; use std::sync::mpsc::channel; use std::time::Duration; -use std::sync::{RwLock, Arc}; use chrono::Local; use cursive::direction::Absolute; @@ -30,7 +29,7 @@ impl App { _file_watcher: watcher, file_event_recv: rx, view_month_offset: 0, - message: Arc::new(RwLock::new("Type :add to get started, Ctrl-L to dismiss".into())), + message: "Type :add to get started, Ctrl-L to dismiss".into(), }; } @@ -42,7 +41,7 @@ impl App { let old_len = self.habits.len(); self.habits.retain(|h| h.name() != name); if old_len == self.habits.len() { - self.message.write().unwrap() + self.message .set_message(format!("Could not delete habit `{}`", name)) } } @@ -115,7 +114,7 @@ impl App { } pub fn clear_message(&mut self) { - self.message.write().unwrap().clear(); + self.message.clear(); } pub fn status(&self) -> StatusLine { @@ -237,8 +236,8 @@ impl App { Command::Blank => {} }, Err(e) => { - self.message.write().unwrap().set_message(e.to_string()); - self.message.write().unwrap().set_kind(MessageKind::Error); + self.message.set_message(e.to_string()); + self.message.set_kind(MessageKind::Error); } } } -- cgit v1.2.3