Merge branch 'main' into cursors

2024-01-18 14:03:27 -07:00
parent ef0432da0d d64207e009
commit bfee008bb2
199 changed files with 3365 additions and 1735 deletions
@@ -150,11 +150,9 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);

 impl Telemetry {
    pub fn new(client: Arc<dyn HttpClient>, cx: &mut AppContext) -> Arc<Self> {
-        let release_channel = if cx.has_global::<ReleaseChannel>() {
-            Some(cx.global::<ReleaseChannel>().display_name())
-        } else {
-            None
-        };
+        let release_channel = cx
+            .try_global::<ReleaseChannel>()
+            .map(|release_channel| release_channel.display_name());

        TelemetrySettings::register(cx);