Rename zed-rpc to zrpc
Co-Authored-By: Nathan Sobo <nathan@zed.dev> Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
co-authored by
Nathan Sobo
Max Brunsfeld
parent
c4e37dc47c
commit
391ad489ff
@@ -11,7 +11,7 @@ use seahash::SeaHasher;
|
||||
pub use selection::*;
|
||||
use similar::{ChangeTag, TextDiff};
|
||||
use tree_sitter::{InputEdit, Parser, QueryCursor};
|
||||
use zed_rpc::proto;
|
||||
use zrpc::proto;
|
||||
|
||||
use crate::{
|
||||
language::{Language, Tree},
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
use zed_rpc::ForegroundRouter;
|
||||
use zrpc::ForegroundRouter;
|
||||
|
||||
pub mod assets;
|
||||
pub mod editor;
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ use zed::{
|
||||
worktree::{self, RealFs},
|
||||
AppState,
|
||||
};
|
||||
use zed_rpc::ForegroundRouter;
|
||||
use zrpc::ForegroundRouter;
|
||||
|
||||
fn main() {
|
||||
init_logger();
|
||||
|
||||
+3
-3
@@ -9,8 +9,8 @@ use std::collections::HashMap;
|
||||
use std::time::Duration;
|
||||
use std::{convert::TryFrom, future::Future, sync::Arc};
|
||||
use surf::Url;
|
||||
pub use zed_rpc::{proto, ConnectionId, PeerId, TypedEnvelope};
|
||||
use zed_rpc::{
|
||||
pub use zrpc::{proto, ConnectionId, PeerId, TypedEnvelope};
|
||||
use zrpc::{
|
||||
proto::{EnvelopedMessage, RequestMessage},
|
||||
ForegroundRouter, Peer, Receipt,
|
||||
};
|
||||
@@ -158,7 +158,7 @@ impl Client {
|
||||
// zed server to encrypt the user's access token, so that it can'be intercepted by
|
||||
// any other app running on the user's device.
|
||||
let (public_key, private_key) =
|
||||
zed_rpc::auth::keypair().expect("failed to generate keypair for auth");
|
||||
zrpc::auth::keypair().expect("failed to generate keypair for auth");
|
||||
let public_key_string =
|
||||
String::try_from(public_key).expect("failed to serialize public key for auth");
|
||||
|
||||
|
||||
+2
-2
@@ -7,10 +7,10 @@ use std::{
|
||||
sync::Arc,
|
||||
};
|
||||
use tempdir::TempDir;
|
||||
use zed_rpc::ForegroundRouter;
|
||||
use zrpc::ForegroundRouter;
|
||||
|
||||
#[cfg(feature = "test-support")]
|
||||
pub use zed_rpc::test::Channel;
|
||||
pub use zrpc::test::Channel;
|
||||
|
||||
#[cfg(test)]
|
||||
#[ctor::ctor]
|
||||
|
||||
+4
-4
@@ -61,8 +61,8 @@ impl<'a> AddAssign<&'a Local> for Local {
|
||||
#[derive(Clone, Default, Hash, Eq, PartialEq)]
|
||||
pub struct Global(SmallVec<[Local; 3]>);
|
||||
|
||||
impl From<Vec<zed_rpc::proto::VectorClockEntry>> for Global {
|
||||
fn from(message: Vec<zed_rpc::proto::VectorClockEntry>) -> Self {
|
||||
impl From<Vec<zrpc::proto::VectorClockEntry>> for Global {
|
||||
fn from(message: Vec<zrpc::proto::VectorClockEntry>) -> Self {
|
||||
let mut version = Self::new();
|
||||
for entry in message {
|
||||
version.observe(Local {
|
||||
@@ -74,11 +74,11 @@ impl From<Vec<zed_rpc::proto::VectorClockEntry>> for Global {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> From<&'a Global> for Vec<zed_rpc::proto::VectorClockEntry> {
|
||||
impl<'a> From<&'a Global> for Vec<zrpc::proto::VectorClockEntry> {
|
||||
fn from(version: &'a Global) -> Self {
|
||||
version
|
||||
.iter()
|
||||
.map(|entry| zed_rpc::proto::VectorClockEntry {
|
||||
.map(|entry| zrpc::proto::VectorClockEntry {
|
||||
replica_id: entry.replica_id as u32,
|
||||
timestamp: entry.value,
|
||||
})
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ use std::{
|
||||
},
|
||||
time::{Duration, SystemTime},
|
||||
};
|
||||
use zed_rpc::{ForegroundRouter, PeerId, TypedEnvelope};
|
||||
use zrpc::{ForegroundRouter, PeerId, TypedEnvelope};
|
||||
|
||||
lazy_static! {
|
||||
static ref GITIGNORE: &'static OsStr = OsStr::new(".gitignore");
|
||||
|
||||
Reference in New Issue
Block a user