From 04086186a00d50f22a7e1914d89a8dd1beb695cc Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Fri, 9 Mar 2018 17:57:24 +0100 Subject: [PATCH] Provide correct default for scroll_history When implementing fallback to the default value with an u32 you will get 0 as the default value. However the default scrollback value is 10_000. A custom deserializer has been implemented which automatically falls back to the correct default value. --- src/config.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/config.rs b/src/config.rs index 2c2cfe46..d49dd3b4 100644 --- a/src/config.rs +++ b/src/config.rs @@ -398,7 +398,7 @@ pub struct Config { tabspaces: usize, /// How much scrolling history to keep - #[serde(default="default_scroll_history", deserialize_with="failure_default")] + #[serde(default="default_scroll_history", deserialize_with="deserialize_scroll_history")] scroll_history: u32, } @@ -406,6 +406,18 @@ fn default_scroll_history() -> u32 { 10_000 } +fn deserialize_scroll_history<'a, D>(deserializer: D) -> ::std::result::Result + where D: de::Deserializer<'a> +{ + match u32::deserialize(deserializer) { + Ok(lines) => Ok(lines), + Err(err) => { + eprintln!("problem with config: {}; Using default value", err); + Ok(default_scroll_history()) + }, + } +} + fn failure_default_vec<'a, D, T>(deserializer: D) -> ::std::result::Result, D::Error> where D: de::Deserializer<'a>, T: Deserialize<'a>