Compatibility fix for dashboard settings.

data/src/dashboard.rs

@@ -5,14 +5,15 @@ use serde::{Deserialize, Serialize};
 
 use crate::buffer::Buffer;
 use crate::pane::Pane;
+use crate::serde::fail_as_none;
 use crate::{compression, environment};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Dashboard {
     pub pane: Pane,
     #[serde(default)]
     pub popout_panes: Vec<Pane>,
-    #[serde(default)]
+    #[serde(default, deserialize_with = "fail_as_none")]
     pub focus_buffer: Option<Buffer>,
 }
 

data/src/lib.rs

@@ -39,6 +39,7 @@ pub mod message;
 pub mod mode;
 pub mod pane;
 pub mod preview;
+pub mod serde;
 pub mod server;
 pub mod shortcut;
 pub mod stream;

data/src/message.rs

@@ -10,7 +10,7 @@ use irc::proto::Command;
 use itertools::{Either, Itertools};
 use once_cell::sync::Lazy;
 use regex::{Regex, RegexBuilder};
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 use url::Url;
 
 pub use self::formatting::Formatting;
@@ -20,6 +20,7 @@ pub use self::source::{
 };
 
 use crate::config::buffer::UsernameFormat;
+use crate::serde::fail_as_none;
 use crate::time::Posix;
 use crate::user::{Nick, NickRef};
 use crate::{ctcp, isupport, target, Config, Server, User};
@@ -1403,20 +1404,6 @@ pub enum Link {
     GoToMessage(Server, target::Channel, Hash),
 }
 
-fn fail_as_none<'de, T, D>(deserializer: D) -> Result<Option<T>, D::Error>
-where
-    T: Deserialize<'de>,
-    D: Deserializer<'de>,
-{
-    // We must fully consume valid json otherwise the error leaves the
-    // deserializer in an invalid state and it'll still fail
-    //
-    // This assumes we always use a json format
-    let intermediate = serde_json::Value::deserialize(deserializer)?;
-
-    Ok(Option::<T>::deserialize(intermediate).unwrap_or_default())
-}
-
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 pub struct MessageReferences {
     pub timestamp: DateTime<Utc>,

data/src/serde.rs

@@ -0,0 +1,15 @@
+use serde::{Deserialize, Deserializer};
+
+pub fn fail_as_none<'de, T, D>(deserializer: D) -> Result<Option<T>, D::Error>
+where
+    T: Deserialize<'de>,
+    D: Deserializer<'de>,
+{
+    // We must fully consume valid json otherwise the error leaves the
+    // deserializer in an invalid state and it'll still fail
+    //
+    // This assumes we always use a json format
+    let intermediate = serde_json::Value::deserialize(deserializer)?;
+
+    Ok(Option::<T>::deserialize(intermediate).unwrap_or_default())
+}