Move ProtoClient to RPC crate, behind feature flag disabled in collab (#17908)

This fixes a bug where we accidentally added a `gpui` transitive
dependency in `collab`.

Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2024-09-16 14:50:30 -07:00 committed by GitHub
parent ca2cce79ed
commit 01bb10f518
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 31 additions and 42 deletions

View file

@ -17,10 +17,7 @@ use language::{
proto::{deserialize_line_ending, deserialize_version, serialize_version, split_operations},
Buffer, Capability, Event as BufferEvent, File as _, Language, Operation,
};
use rpc::{
proto::{self, AnyProtoClient},
ErrorExt as _, TypedEnvelope,
};
use rpc::{proto, AnyProtoClient, ErrorExt as _, TypedEnvelope};
use smol::channel::Receiver;
use std::{io, path::Path, str::FromStr as _, sync::Arc, time::Instant};
use text::BufferId;

View file

@ -49,7 +49,7 @@ use parking_lot::{Mutex, RwLock};
use postage::watch;
use rand::prelude::*;
use rpc::proto::AnyProtoClient;
use rpc::AnyProtoClient;
use serde::Serialize;
use settings::{Settings, SettingsLocation, SettingsStore};
use sha2::{Digest, Sha256};

View file

@ -62,10 +62,7 @@ use paths::{local_tasks_file_relative_path, local_vscode_tasks_file_relative_pat
use prettier_support::{DefaultPrettier, PrettierInstance};
use project_settings::{LspSettings, ProjectSettings, SettingsObserver};
use remote::SshSession;
use rpc::{
proto::{AnyProtoClient, SSH_PROJECT_ID},
ErrorCode,
};
use rpc::{proto::SSH_PROJECT_ID, AnyProtoClient, ErrorCode};
use search::{SearchInputKind, SearchQuery, SearchResult};
use search_history::SearchHistory;
use settings::{watch_config_file, Settings, SettingsLocation, SettingsStore};

View file

@ -2,10 +2,7 @@ use collections::HashMap;
use fs::Fs;
use gpui::{AppContext, AsyncAppContext, BorrowAppContext, Model, ModelContext};
use paths::local_settings_file_relative_path;
use rpc::{
proto::{self, AnyProtoClient},
TypedEnvelope,
};
use rpc::{proto, AnyProtoClient, TypedEnvelope};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::{Settings, SettingsSources, SettingsStore};

View file

@ -17,8 +17,8 @@ use gpui::{
};
use postage::oneshot;
use rpc::{
proto::{self, AnyProtoClient, SSH_PROJECT_ID},
TypedEnvelope,
proto::{self, SSH_PROJECT_ID},
AnyProtoClient, TypedEnvelope,
};
use smol::{
channel::{Receiver, Sender},