diff --git a/zed/src/rpc.rs b/zed/src/rpc.rs index 0427e3ad92fd6f112a784e14210a55a0f9e0ecd6..f3df1e7b88d0fac18a9380339d38a76c56efbff3 100644 --- a/zed/src/rpc.rs +++ b/zed/src/rpc.rs @@ -1,22 +1,24 @@ use crate::util::ResultExt; use anyhow::{anyhow, Context, Result}; -use async_tungstenite::tungstenite::http::Request; -use async_tungstenite::tungstenite::{Error as WebSocketError, Message as WebSocketMessage}; +use async_tungstenite::tungstenite::{ + http::Request, Error as WebSocketError, Message as WebSocketMessage, +}; use gpui::{AsyncAppContext, Entity, ModelContext, Task}; use lazy_static::lazy_static; use parking_lot::RwLock; -use postage::prelude::Stream; -use postage::watch; -use std::any::TypeId; -use std::collections::HashMap; -use std::sync::Weak; -use std::time::{Duration, Instant}; -use std::{convert::TryFrom, future::Future, sync::Arc}; +use postage::{prelude::Stream, watch}; +use std::{ + any::TypeId, + collections::HashMap, + convert::TryFrom, + future::Future, + sync::{Arc, Weak}, + time::{Duration, Instant}, +}; use surf::Url; -use zrpc::proto::{AnyTypedEnvelope, EntityMessage}; pub use zrpc::{proto, ConnectionId, PeerId, TypedEnvelope}; use zrpc::{ - proto::{EnvelopedMessage, RequestMessage}, + proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, RequestMessage}, Peer, Receipt, };