Skip to content

Commit a036548

Browse files
committed
Remove v3 feature flag leftovers
1 parent df103a4 commit a036548

File tree

5 files changed

+0
-27
lines changed

5 files changed

+0
-27
lines changed

crates/but-settings/src/api.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub struct TelemetryUpdate {
1515
#[serde(rename_all = "camelCase")]
1616
/// Update request for [`crate::app_settings::FeatureFlags`].
1717
pub struct FeatureFlagsUpdate {
18-
pub v3: Option<bool>,
1918
pub ws3: Option<bool>,
2019
pub actions: Option<bool>,
2120
pub butbot: Option<bool>,
@@ -53,17 +52,13 @@ impl AppSettingsWithDiskSync {
5352
pub fn update_feature_flags(
5453
&self,
5554
FeatureFlagsUpdate {
56-
v3,
5755
ws3,
5856
actions,
5957
butbot,
6058
rules,
6159
}: FeatureFlagsUpdate,
6260
) -> Result<()> {
6361
let mut settings = self.get_mut_enforce_save()?;
64-
if let Some(v3) = v3 {
65-
settings.feature_flags.v3 = v3;
66-
}
6762
if let Some(ws3) = ws3 {
6863
settings.feature_flags.ws3 = ws3;
6964
}

crates/but-settings/src/app_settings.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ pub struct GitHubOAuthAppSettings {
2323
#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
2424
#[serde(rename_all = "camelCase")]
2525
pub struct FeatureFlags {
26-
/// Enables the v3 design, as well as the purgatory mode (no uncommitted diff ownership assignments).
27-
#[serde(
28-
default = "FeatureFlags::always_true",
29-
deserialize_with = "FeatureFlags::deserialize_v3_true"
30-
)]
31-
pub v3: bool,
3226
/// Enable the usage of V3 workspace APIs.
3327
#[serde(default = "default_true")]
3428
pub ws3: bool,
@@ -59,19 +53,6 @@ fn default_true() -> bool {
5953
true
6054
}
6155

62-
impl FeatureFlags {
63-
fn always_true() -> bool {
64-
true
65-
}
66-
67-
fn deserialize_v3_true<'de, D>(_deserializer: D) -> Result<bool, D::Error>
68-
where
69-
D: serde::Deserializer<'de>,
70-
{
71-
Ok(true)
72-
}
73-
}
74-
7556
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
7657
#[serde(rename_all = "camelCase")]
7758
pub struct ExtraCsp {

crates/but-testing/src/command/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ pub mod stacks {
342342
// Enable v3 feature flags for the command context
343343
let app_settings = AppSettings {
344344
feature_flags: but_settings::app_settings::FeatureFlags {
345-
v3: true,
346345
ws3,
347346
undo: false,
348347
actions: false,

crates/but/src/mcp_internal/stack.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub fn create_stack_with_branch(
3030
// Enable v3 feature flags for the command context
3131
let app_settings = AppSettings {
3232
feature_flags: but_settings::app_settings::FeatureFlags {
33-
v3: true,
3433
// Keep this off until it caught up at least.
3534
ws3: false,
3635
undo: false,

crates/but/src/mcp_internal/status.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn project_status(project_dir: &Path) -> anyhow::Result<but_tools::workspace
1010
// Enable v3 feature flags for the command context
1111
let app_settings = AppSettings {
1212
feature_flags: but_settings::app_settings::FeatureFlags {
13-
v3: true,
1413
// Keep this off until it caught up at least.
1514
ws3: false,
1615
undo: false,

0 commit comments

Comments
 (0)