Skip to content

Commit 8d2525a

Browse files
vorporealvorporeal
committed
Delete unused new_from_server_update function.
1 parent 2e92574 commit 8d2525a

15 files changed

Lines changed: 14 additions & 137 deletions

File tree

‎app/src/ai/ambient_agents/scheduled.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::{
1313
persistence::CloudModel,
1414
},
1515
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
16-
JsonObjectType, Owner, Revision, ServerCloudObject,
16+
JsonObjectType, Owner, Revision,
1717
},
1818
drive::CloudObjectTypeAndId,
1919
server::{
@@ -123,15 +123,6 @@ impl StringModel for ScheduledAmbientAgent {
123123
None
124124
}
125125

126-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
127-
if let ServerCloudObject::ScheduledAmbientAgent(server_scheduled_agent) =
128-
server_cloud_object
129-
{
130-
return Some(server_scheduled_agent.model.clone().string_model);
131-
}
132-
None
133-
}
134-
135126
fn should_show_activity_toasts() -> bool {
136127
false
137128
}

‎app/src/ai/cloud_agent_config/mod.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
persistence::CloudModel,
1010
},
1111
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
12-
JsonObjectType, Revision, ServerCloudObject,
12+
JsonObjectType, Revision,
1313
},
1414
server::{ids::SyncId, server_api::ai::AgentConfigSnapshot, sync_queue::QueueItem},
1515
};
@@ -106,13 +106,6 @@ impl StringModel for AgentConfig {
106106
None
107107
}
108108

109-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
110-
if let ServerCloudObject::CloudAgentConfig(server_config) = server_cloud_object {
111-
return Some(server_config.model.clone().string_model);
112-
}
113-
None
114-
}
115-
116109
fn should_show_activity_toasts() -> bool {
117110
false
118111
}

‎app/src/ai/cloud_environments/mod.rs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::{
1111
persistence::CloudModel,
1212
},
1313
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
14-
JsonObjectType, Revision, ServerCloudObject,
14+
JsonObjectType, Revision,
1515
},
1616
server::{ids::SyncId, sync_queue::QueueItem},
1717
workspaces::user_workspaces::UserWorkspaces,
@@ -181,14 +181,6 @@ impl StringModel for AmbientAgentEnvironment {
181181
None
182182
}
183183

184-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
185-
if let ServerCloudObject::AmbientAgentEnvironment(server_environment) = server_cloud_object
186-
{
187-
return Some(server_environment.model.clone().string_model);
188-
}
189-
None
190-
}
191-
192184
fn should_show_activity_toasts() -> bool {
193185
false
194186
}

‎app/src/ai/execution_profiles/mod.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::{
1111
json_model::{JsonModel, JsonSerializer},
1212
},
1313
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
14-
JsonObjectType, Revision, ServerCloudObject,
14+
JsonObjectType, Revision,
1515
},
1616
settings::{
1717
AgentModeCommandExecutionPredicate, DEFAULT_COMMAND_EXECUTION_ALLOWLIST,
@@ -474,15 +474,6 @@ impl StringModel for AIExecutionProfile {
474474
}
475475
}
476476

477-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
478-
if let ServerCloudObject::AIExecutionProfile(server_ai_execution_profile) =
479-
server_cloud_object
480-
{
481-
return Some(server_ai_execution_profile.model.clone().string_model);
482-
}
483-
None
484-
}
485-
486477
fn should_clear_on_unique_key_conflict(&self) -> bool {
487478
true
488479
}

‎app/src/ai/facts/mod.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
json_model::{JsonModel, JsonSerializer},
99
},
1010
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
11-
JsonObjectType, Revision, ServerCloudObject,
11+
JsonObjectType, Revision,
1212
},
1313
drive::CloudObjectTypeAndId,
1414
};
@@ -90,13 +90,6 @@ impl StringModel for AIFact {
9090
}
9191
}
9292

93-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
94-
if let ServerCloudObject::AIFact(server_ai_fact) = server_cloud_object {
95-
return Some(server_ai_fact.model.clone().string_model);
96-
}
97-
None
98-
}
99-
10093
fn uniqueness_key(&self) -> Option<GenericStringObjectUniqueKey> {
10194
None
10295
}

‎app/src/ai/mcp/mod.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::{
1515
persistence::CloudModel,
1616
},
1717
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
18-
JsonObjectType, Revision, ServerCloudObject,
18+
JsonObjectType, Revision,
1919
},
2020
drive::{
2121
items::{mcp_server::WarpDriveMCPServer, WarpDriveItem},
@@ -226,13 +226,6 @@ impl StringModel for MCPServer {
226226
}
227227
}
228228

229-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
230-
if let ServerCloudObject::MCPServer(server_mcp_server) = server_cloud_object {
231-
return Some(server_mcp_server.model.clone().string_model);
232-
}
233-
None
234-
}
235-
236229
fn uniqueness_key(&self) -> Option<GenericStringObjectUniqueKey> {
237230
None
238231
}

‎app/src/ai/mcp/templatable.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::{
1515
persistence::CloudModel,
1616
},
1717
GenericCloudObject, GenericStringObjectFormat, GenericStringObjectUniqueKey,
18-
JsonObjectType, Revision, ServerCloudObject, UniquePer,
18+
JsonObjectType, Revision, UniquePer,
1919
},
2020
drive::items::WarpDriveItem,
2121
server::{datetime_ext::DateTimeExt, ids::SyncId, sync_queue::QueueItem},
@@ -270,15 +270,6 @@ impl StringModel for TemplatableMCPServer {
270270
}
271271
}
272272

273-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
274-
if let ServerCloudObject::TemplatableMCPServer(server_templatable_mcp_server) =
275-
server_cloud_object
276-
{
277-
return Some(server_templatable_mcp_server.model.clone().string_model);
278-
}
279-
None
280-
}
281-
282273
fn uniqueness_key(&self) -> Option<GenericStringObjectUniqueKey> {
283274
Some(GenericStringObjectUniqueKey {
284275
key: format!("{UNIQUENESS_KEY_PREFIX}_{}", self.uuid),

‎app/src/cloud_object/mod.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,6 @@ pub trait CloudModelType: Debug + Clone + Send + Sync {
554554
/// revision, which doesn't go through this code path.
555555
fn should_update_after_server_conflict(&self) -> bool;
556556

557-
/// Returns a new instance from a server update, or None if the update should be ignored.
558-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self>;
559-
560557
/// Whether this model type can be exported.
561558
fn can_export(&self) -> bool {
562559
false

‎app/src/cloud_object/model/generic_string_model.rs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ use crate::{
66
cloud_object::{
77
CloudModelType, CloudObject, CloudObjectEventEntrypoint, CreateCloudObjectResult,
88
CreateObjectRequest, GenericCloudObject, GenericServerObject, GenericStringObjectFormat,
9-
GenericStringObjectUniqueKey, ObjectType, Revision, ServerCloudObject,
10-
UpdateCloudObjectResult,
9+
GenericStringObjectUniqueKey, ObjectType, Revision, UpdateCloudObjectResult,
1110
},
1211
drive::{items::WarpDriveItem, CloudObjectTypeAndId},
1312
persistence::ModelEvent,
@@ -108,9 +107,6 @@ pub trait StringModel: Clone + Debug + PartialEq + Send + Sync + 'static {
108107
object: &Self::CloudObjectType,
109108
) -> QueueItem;
110109

111-
/// Returns a new instance from a server update, or None if the update should be ignored.
112-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self>;
113-
114110
/// Returns whether this model type should clear on a unique key conflict.
115111
fn should_clear_on_unique_key_conflict(&self) -> bool {
116112
false
@@ -276,12 +272,6 @@ where
276272
true
277273
}
278274

279-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
280-
self.string_model
281-
.new_from_server_update(server_cloud_object)
282-
.map(Self::new)
283-
}
284-
285275
fn serialized(&self) -> SerializedModel {
286276
S::serialize(&self.string_model)
287277
}

‎app/src/drive/folders/mod.rs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
appearance::Appearance,
99
cloud_object::{
1010
CloudModelType, CloudObjectEventEntrypoint, CreateCloudObjectResult, CreateObjectRequest,
11-
GenericCloudObject, GenericServerObject, ObjectType, Revision, ServerCloudObject, Space,
11+
GenericCloudObject, GenericServerObject, ObjectType, Revision, Space,
1212
UpdateCloudObjectResult,
1313
},
1414
persistence::ModelEvent,
@@ -120,17 +120,6 @@ impl CloudModelType for CloudFolderModel {
120120
SerializedModel::new(self.name.to_owned())
121121
}
122122

123-
fn new_from_server_update(&self, server_cloud_object: &ServerCloudObject) -> Option<Self> {
124-
if let ServerCloudObject::Folder(server_folder) = server_cloud_object {
125-
return Some(CloudFolderModel {
126-
name: server_folder.model.name.clone(),
127-
is_open: self.is_open,
128-
is_warp_pack: server_folder.model.is_warp_pack,
129-
});
130-
}
131-
None
132-
}
133-
134123
fn can_move_to_space(&self, current_space: Space, new_space: Space) -> bool {
135124
// We don't currently support moving folders across spaces.
136125
current_space == new_space

0 commit comments

Comments
 (0)