first pass of merging in warp (doesn't build)

app/src/experiments/block_onboarding_layer.rs

@@ -1,7 +1,10 @@
+use std::collections::HashMap;
+use std::str::FromStr;
+
+use lazy_static::lazy_static;
+
 use super::Experiment;
 use crate::experiments::{BucketRange, Layer};
-use lazy_static::lazy_static;
-use std::{collections::HashMap, str::FromStr};
 
 lazy_static! {
     pub static ref BLOCK_ONBOARDING_LAYER: Layer = Layer {

app/src/experiments/improved_palette_search_layer.rs

@@ -1,9 +1,11 @@
-use crate::experiments::{BucketRange, Experiment, Layer};
-use galaxyui::AppContext;
-use lazy_static::lazy_static;
 use std::collections::HashMap;
 use std::str::FromStr;
 
+use lazy_static::lazy_static;
+use galaxyui::AppContext;
+
+use crate::experiments::{BucketRange, Experiment, Layer};
+
 lazy_static! {
     pub static ref IMPROVED_PALETTE_SEARCH_LAYER: Layer = Layer {
         name: "ImprovedPaletteSearchLayer",

app/src/experiments/login_layer.rs

@@ -1,8 +1,10 @@
-use super::{BucketRange, Experiment, Layer};
-use lazy_static::lazy_static;
 use std::collections::HashMap;
 use std::str::FromStr;
 
+use lazy_static::lazy_static;
+
+use super::{BucketRange, Experiment, Layer};
+
 lazy_static! {
     pub static ref LOGIN_LAYER: Layer = Layer {
         name: "LoginLayer",

app/src/experiments/mod.rs

@@ -8,26 +8,24 @@
 mod block_onboarding_layer;
 mod login_layer;
 mod rendering;
-pub use block_onboarding_layer::{BlockOnboarding, BLOCK_ONBOARDING_LAYER};
-pub use free_tier_default_model_layer::{FreeTierDefaultModel, FREE_TIER_DEFAULT_MODEL_LAYER};
-use galaxy_core::user_preferences::GetUserPreferences as _;
-pub use improved_palette_search_layer::{ImprovedPaletteSearch, IMPROVED_PALETTE_SEARCH_LAYER};
-#[allow(unused_imports)]
-pub use login_layer::{AuthFlowInstructions, LOGIN_LAYER};
-
-use crate::auth::auth_state::AuthStateProvider;
-use crate::channel::{Channel, ChannelState};
-use anyhow::Result;
-use dashmap::DashMap;
-use lazy_static::lazy_static;
+use std::collections::HashMap;
 use std::fmt;
+use std::hash::Hasher;
 use std::marker::Copy;
 use std::ops::Range;
 use std::str::FromStr;
-use std::{collections::HashMap, hash::Hasher};
 
+use anyhow::Result;
+pub use block_onboarding_layer::{BlockOnboarding, BLOCK_ONBOARDING_LAYER};
+use dashmap::DashMap;
+pub use improved_palette_search_layer::{ImprovedPaletteSearch, IMPROVED_PALETTE_SEARCH_LAYER};
+use lazy_static::lazy_static;
+pub use login_layer::{AuthFlowInstructions, LOGIN_LAYER};
+use galaxy_core::user_preferences::GetUserPreferences as _;
 use galaxyui::{AppContext, SingletonEntity};
 
+use crate::auth::auth_state::AuthStateProvider;
+use crate::channel::{Channel, ChannelState};
 use crate::send_telemetry_sync_from_app_ctx;
 
 /// Number of buckets we are using to partition user traffic. The largest valid
@@ -71,7 +69,6 @@ lazy_static! {
         &*BLOCK_ONBOARDING_LAYER,
         &*rendering::LAYER,
         &*IMPROVED_PALETTE_SEARCH_LAYER,
-        &*FREE_TIER_DEFAULT_MODEL_LAYER,
     ];
 
     /// Mapping of experiments to their respective layers. The mappings are built up
@@ -406,7 +403,6 @@ pub fn init(ctx: &mut AppContext) {
 #[path = "mod_tests.rs"]
 mod tests;
 
-mod free_tier_default_model_layer;
 mod improved_palette_search_layer;
 #[cfg(test)]
 mod validation_tests;

app/src/experiments/validation_tests.rs

@@ -1,7 +1,8 @@
-use super::*;
 use std::cmp::max;
 use std::collections::HashSet;
 
+use super::*;
+
 #[test]
 fn test_all_layers_have_unique_seeds() {
     let mut prev_seen_seeds = HashSet::new();