mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Simplify saving RpcClient by removing the generic connection param

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-15 15:36:58 +02:00
parent 3e391c0785
commit cf67fc6589
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
zed/src/rpc_client.rs
View file

@ -6,7 +6,7 @@ use postage::{
prelude::{Sink, Stream},
};
use smol::{
io::{ReadHalf, WriteHalf},
io::{BoxedWriter, ReadHalf},
lock::Mutex,
prelude::{AsyncRead, AsyncWrite},
};
@ -22,18 +22,18 @@ use zed_rpc::proto::{
self, MessageStream, RequestMessage, SendMessage, ServerMessage, SubscribeMessage,
};
pub struct RpcClient<Conn> {
pub struct RpcClient {
response_channels: Arc<Mutex<HashMap<i32, (mpsc::Sender<proto::from_server::Variant>, bool)>>>,
outgoing: Mutex<MessageStream<WriteHalf<Conn>>>,
outgoing: Mutex<MessageStream<BoxedWriter>>,
next_message_id: AtomicI32,
_drop_tx: barrier::Sender,
}
impl<Conn> RpcClient<Conn>
where
Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
{
pub fn new(conn: Conn, executor: Arc<Background>) -> Arc<Self> {
impl RpcClient {
pub fn new<Conn>(conn: Conn, executor: Arc<Background>) -> Arc<Self>
where
Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
{
let response_channels = Arc::new(Mutex::new(HashMap::new()));
let (conn_rx, conn_tx) = smol::io::split(conn);
let (_drop_tx, drop_rx) = barrier::channel();
@ -48,19 +48,21 @@ where
Arc::new(Self {
response_channels,
outgoing: Mutex::new(MessageStream::new(conn_tx)),
outgoing: Mutex::new(MessageStream::new(Box::pin(conn_tx))),
_drop_tx,
next_message_id: AtomicI32::new(0),
})
}
async fn handle_incoming(
async fn handle_incoming<Conn>(
conn: ReadHalf<Conn>,
mut drop_rx: barrier::Receiver,
response_channels: Arc<
Mutex<HashMap<i32, (mpsc::Sender<proto::from_server::Variant>, bool)>>,
>,
) {
) where
Conn: AsyncRead + Unpin,
{
let dropped = drop_rx.recv();
smol::pin!(dropped);