Define language settings in the language crate

2023-05-16 17:29:53 -07:00
parent 9ae10a5dd9
commit 39618ae32d
54 changed files with 1348 additions and 1161 deletions
@@ -350,17 +350,18 @@ impl settings::Setting for TelemetrySettings {
        default_value: &Self::FileContent,
        user_values: &[&Self::FileContent],
        _: &AppContext,
-    ) -> Self {
-        Self {
-            diagnostics: user_values
-                .first()
-                .and_then(|v| v.diagnostics)
-                .unwrap_or(default_value.diagnostics.unwrap()),
+    ) -> Result<Self> {
+        Ok(Self {
+            diagnostics: user_values.first().and_then(|v| v.diagnostics).unwrap_or(
+                default_value
+                    .diagnostics
+                    .ok_or_else(Self::missing_default)?,
+            ),
            metrics: user_values
                .first()
                .and_then(|v| v.metrics)
-                .unwrap_or(default_value.metrics.unwrap()),
-        }
+                .unwrap_or(default_value.metrics.ok_or_else(Self::missing_default)?),
+        })
    }
 }