gpui: Add Global marker trait (#7095)

This should prevent a class of bugs where one queries the wrong type of
global, which results in oddities at runtime.

Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>

crates/settings/Cargo.toml

@@ -17,6 +17,7 @@ collections = { path = "../collections" }
 gpui = { path = "../gpui" }
 fs = { path = "../fs" }
 feature_flags = { path = "../feature_flags" }
+release_channel = { path = "../release_channel" }
 util = { path = "../util" }
 
 anyhow.workspace = true

crates/settings/src/settings_store.rs

@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Context, Result};
 use collections::{btree_map, hash_map, BTreeMap, HashMap};
-use gpui::{AppContext, AsyncAppContext};
+use gpui::{AppContext, AsyncAppContext, Global};
 use lazy_static::lazy_static;
 use schemars::{gen::SchemaGenerator, schema::RootSchema, JsonSchema};
 use serde::{de::DeserializeOwned, Deserialize as _, Serialize};
@@ -13,9 +13,7 @@ use std::{
     str,
     sync::Arc,
 };
-use util::{
-    channel::RELEASE_CHANNEL_NAME, merge_non_null_json_value_into, RangeExt, ResultExt as _,
-};
+use util::{merge_non_null_json_value_into, RangeExt, ResultExt as _};
 
 /// A value that can be defined as a user setting.
 ///
@@ -139,6 +137,8 @@ pub struct SettingsStore {
     )>,
 }
 
+impl Global for SettingsStore {}
+
 impl Default for SettingsStore {
     fn default() -> Self {
         SettingsStore {
@@ -207,7 +207,10 @@ impl SettingsStore {
                 user_values_stack = vec![user_settings];
             }
 
-            if let Some(release_settings) = &self.raw_user_settings.get(&*RELEASE_CHANNEL_NAME) {
+            if let Some(release_settings) = &self
+                .raw_user_settings
+                .get(&*release_channel::RELEASE_CHANNEL_NAME)
+            {
                 if let Some(release_settings) = setting_value
                     .deserialize_setting(&release_settings)
                     .log_err()
@@ -537,7 +540,10 @@ impl SettingsStore {
                 paths_stack.push(None);
             }
 
-            if let Some(release_settings) = &self.raw_user_settings.get(&*RELEASE_CHANNEL_NAME) {
+            if let Some(release_settings) = &self
+                .raw_user_settings
+                .get(&*release_channel::RELEASE_CHANNEL_NAME)
+            {
                 if let Some(release_settings) = setting_value
                     .deserialize_setting(&release_settings)
                     .log_err()