From 7efeb0662a3a5d618fd44f92a8c470d67d8d54fc Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 22 Aug 2022 13:27:36 -0700
Subject: [PATCH] Changed name to experiments

---
 crates/settings/src/settings.rs | 8 ++++----
 crates/terminal/src/terminal.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 360ff1ac08..a520dbaf67 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -20,7 +20,7 @@ pub use keymap_file::{keymap_file_json_schema, KeymapFileContent};
 
 #[derive(Clone)]
 pub struct Settings {
-    pub nightly: FeatureFlags,
+    pub experiments: FeatureFlags,
     pub projects_online_by_default: bool,
     pub buffer_font_family: FamilyId,
     pub default_buffer_font_size: f32,
@@ -197,7 +197,7 @@ impl Settings {
         .unwrap();
 
         Self {
-            nightly: FeatureFlags::default(),
+            experiments: FeatureFlags::default(),
             buffer_font_family: font_cache
                 .load_family(&[defaults.buffer_font_family.as_ref().unwrap()])
                 .unwrap(),
@@ -256,7 +256,7 @@ impl Settings {
         );
         merge(&mut self.vim_mode, data.vim_mode);
         merge(&mut self.autosave, data.autosave);
-        merge(&mut self.nightly, data.nightly);
+        merge(&mut self.experiments, data.nightly);
         // Ensure terminal font is loaded, so we can request it in terminal_element layout
         if let Some(terminal_font) = &data.terminal.font_family {
             font_cache.load_family(&[terminal_font]).log_err();
@@ -317,7 +317,7 @@ impl Settings {
     #[cfg(any(test, feature = "test-support"))]
     pub fn test(cx: &gpui::AppContext) -> Settings {
         Settings {
-            nightly: FeatureFlags::default(),
+            experiments: FeatureFlags::default(),
             buffer_font_family: cx.font_cache().load_family(&["Monaco"]).unwrap(),
             buffer_font_size: 14.,
             default_buffer_font_size: 14.,
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index c8e7396a6f..668af56145 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -47,7 +47,7 @@ use crate::mappings::{
 ///Initialize and register all of our action handlers
 pub fn init(cx: &mut MutableAppContext) {
     let settings = cx.global::<Settings>();
-    if settings.nightly.modal_terminal {
+    if settings.experiments.modal_terminal {
         cx.add_action(deploy_modal);
     }