From c5b3785be5a29c8442b205411d914c57f3fa42fd Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 26 Jun 2023 16:03:19 +0200 Subject: [PATCH] Revert "Panic in debug if global settings can't be deserialized from defaults" This reverts commit 7a051a0dcbafd467203bcaeec773c269abcd02cd. --- crates/settings/src/settings_store.rs | 31 ++++++++++++--------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs index 5e2be5a881..1188018cd8 100644 --- a/crates/settings/src/settings_store.rs +++ b/crates/settings/src/settings_store.rs @@ -147,28 +147,25 @@ impl SettingsStore { local_values: Vec::new(), })); - let default_settings = setting_value + if let Some(default_settings) = setting_value .deserialize_setting(&self.raw_default_settings) - .expect("can't deserialize default settings"); - - let mut user_values_stack = Vec::new(); - if let Some(user_settings) = setting_value - .deserialize_setting(&self.raw_user_settings) .log_err() { - user_values_stack = vec![user_settings]; - } + let mut user_values_stack = Vec::new(); - #[cfg(debug_assertions)] - setting_value - .load_setting(&default_settings, &[], cx) - .expect("can't deserialize settings from defaults"); + if let Some(user_settings) = setting_value + .deserialize_setting(&self.raw_user_settings) + .log_err() + { + user_values_stack = vec![user_settings]; + } - if let Some(setting) = setting_value - .load_setting(&default_settings, &user_values_stack, cx) - .log_err() - { - setting_value.set_global_value(setting); + if let Some(setting) = setting_value + .load_setting(&default_settings, &user_values_stack, cx) + .log_err() + { + setting_value.set_global_value(setting); + } } }