Don’t panic if config contains scale_with_dpi

Insted emit a warning. Note that without the bool::deserialize call the config parser seems to error out and throw away all of the config. Someone more experienced with serde’s internals than myself might know why. Regardless I added that and it fixed it while also having the side effect of quieting clippy regarding not using the input parameter that is passed by value.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/config.rs b/src/config.rs
index 88ba0ae8..885df16e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1590,13 +1590,15 @@ pub struct Font {
     scale_with_dpi: Option<()>,
 }
 
-fn deserialize_scale_with_dpi<'a, D>(_deserializer: D) -> ::std::result::Result<Option<()>, D::Error>
+fn deserialize_scale_with_dpi<'a, D>(deserializer: D) -> ::std::result::Result<Option<()>, D::Error>
     where D: de::Deserializer<'a>
 {
-    panic!(
-        "The `scale_with_dpi` field has been deprecated, \
-         on X11 the WINIT_HIDPI_FACTOR environment variable can be used instead."
-    );
+    // This seems to be necessary in order for the config containing this entry to be parsed properly
+    let _ignored = bool::deserialize(deserializer);
+    eprintln!(
+        "The `scale_with_dpi` setting has been removed, \
+        on X11 the WINIT_HIDPI_FACTOR environment variable can be used instead.");
+    Ok(None)
 }
 
 fn default_bold_desc() -> FontDescription {