Rename zrpc to rpc
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
parent
fdfed3d7db
commit
d5b60ad124
26 changed files with 62 additions and 66 deletions
|
@ -41,7 +41,7 @@ tide = "0.16.0"
|
|||
tide-compress = "0.9.0"
|
||||
time = "0.2"
|
||||
toml = "0.5.8"
|
||||
zrpc = { path = "../zrpc" }
|
||||
rpc = { path = "../rpc" }
|
||||
|
||||
[dependencies.async-sqlx-session]
|
||||
version = "0.3.0"
|
||||
|
|
|
@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
|
|||
use std::{borrow::Cow, convert::TryFrom, sync::Arc};
|
||||
use surf::{StatusCode, Url};
|
||||
use tide::{log, Error, Server};
|
||||
use zrpc::auth as zed_auth;
|
||||
use rpc::auth as zed_auth;
|
||||
|
||||
static CURRENT_GITHUB_USER: &'static str = "current_github_user";
|
||||
static GITHUB_AUTH_URL: &'static str = "https://github.com/login/oauth/authorize";
|
||||
|
|
|
@ -26,7 +26,7 @@ use std::sync::Arc;
|
|||
use surf::http::cookies::SameSite;
|
||||
use tide::{log, sessions::SessionMiddleware};
|
||||
use tide_compress::CompressMiddleware;
|
||||
use zrpc::Peer;
|
||||
use rpc::Peer;
|
||||
|
||||
type Request = tide::Request<Arc<AppState>>;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ use tide::{
|
|||
Request, Response,
|
||||
};
|
||||
use time::OffsetDateTime;
|
||||
use zrpc::{
|
||||
use rpc::{
|
||||
proto::{self, AnyTypedEnvelope, EnvelopedMessage},
|
||||
Connection, ConnectionId, Peer, TypedEnvelope,
|
||||
};
|
||||
|
@ -897,7 +897,7 @@ pub fn add_routes(app: &mut tide::Server<Arc<AppState>>, rpc: &Arc<Peer>) {
|
|||
.header("X-Zed-Protocol-Version")
|
||||
.and_then(|v| v.as_str().parse().ok());
|
||||
|
||||
if !upgrade_requested || client_protocol_version != Some(zrpc::PROTOCOL_VERSION) {
|
||||
if !upgrade_requested || client_protocol_version != Some(rpc::PROTOCOL_VERSION) {
|
||||
return Ok(Response::new(StatusCode::UpgradeRequired));
|
||||
}
|
||||
|
||||
|
@ -988,7 +988,7 @@ mod tests {
|
|||
workspace::Workspace,
|
||||
worktree::Worktree,
|
||||
};
|
||||
use zrpc::Peer;
|
||||
use rpc::Peer;
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_share_worktree(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::db::{ChannelId, UserId};
|
||||
use anyhow::anyhow;
|
||||
use std::collections::{hash_map, HashMap, HashSet};
|
||||
use zrpc::{proto, ConnectionId};
|
||||
use rpc::{proto, ConnectionId};
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Store {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue