Refactor: rename ttrpc::ttrpc to ttrpc::proto

ttrpc::ttrpc is ambiguous, rename and make it clear.

Fixes: #130

Signed-off-by: Tim Zhang <[email protected]>

Author: Tim-Zhang

example/async-server.rs

@@ -15,7 +15,7 @@ use log::LevelFilter;
 use protocols::r#async::{agent, agent_ttrpc, health, health_ttrpc, types};
 use ttrpc::asynchronous::Server;
 use ttrpc::error::{Error, Result};
-use ttrpc::ttrpc::{Code, Status};
+use ttrpc::proto::{Code, Status};
 
 use async_trait::async_trait;
 use tokio::signal::unix::{signal, SignalKind};

example/server.rs

@@ -23,7 +23,7 @@ use std::thread;
 
 use protocols::sync::{agent, agent_ttrpc, health, health_ttrpc, types};
 use ttrpc::error::{Error, Result};
-use ttrpc::ttrpc::{Code, Status};
+use ttrpc::proto::{Code, Status};
 use ttrpc::Server;
 
 struct HealthService;

src/asynchronous/client.rs

@@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
 
 use crate::common::{client_connect, MESSAGE_TYPE_RESPONSE};
 use crate::error::{Error, Result};
-use crate::ttrpc::{Code, Request, Response};
+use crate::proto::{Code, Request, Response};
 
 use crate::asynchronous::stream::{receive, to_req_buf};
 use crate::r#async::utils;

src/asynchronous/server.rs

@@ -16,8 +16,8 @@ use crate::asynchronous::unix_incoming::UnixIncoming;
 use crate::common::{self, Domain, MESSAGE_TYPE_REQUEST};
 use crate::context;
 use crate::error::{get_status, Error, Result};
+use crate::proto::{Code, Status};
 use crate::r#async::{MethodHandler, TtrpcContext};
-use crate::ttrpc::{Code, Status};
 use crate::MessageHeader;
 use futures::stream::Stream;
 use futures::StreamExt as _;

src/asynchronous/stream.rs

@@ -7,8 +7,8 @@ use byteorder::{BigEndian, ByteOrder};
 
 use crate::common::{MESSAGE_HEADER_LENGTH, MESSAGE_LENGTH_MAX, MESSAGE_TYPE_RESPONSE};
 use crate::error::{get_rpc_status, sock_error_msg, Error, Result};
+use crate::proto::{Code, Response, Status};
 use crate::r#async::utils;
-use crate::ttrpc::{Code, Response, Status};
 use crate::MessageHeader;
 use protobuf::Message;
 use tokio::io::AsyncReadExt;

src/asynchronous/utils.rs

@@ -5,7 +5,7 @@
 
 use crate::common::{MessageHeader, MESSAGE_TYPE_REQUEST, MESSAGE_TYPE_RESPONSE};
 use crate::error::{get_status, Result};
-use crate::ttrpc::{Code, Request, Status};
+use crate::proto::{Code, Request, Status};
 use async_trait::async_trait;
 use protobuf::{CodedInputStream, Message};
 use std::collections::HashMap;

src/context.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-use crate::ttrpc::KeyValue;
+use crate::proto::KeyValue;
 use std::collections::HashMap;
 
 #[derive(Clone, Default, Debug)]
@@ -78,7 +78,7 @@ pub fn to_pb(kvs: HashMap<String, Vec<String>>) -> protobuf::RepeatedField<KeyVa
 #[cfg(test)]
 mod tests {
     use crate::context;
-    use crate::ttrpc::KeyValue;
+    use crate::proto::KeyValue;
 
     #[test]
     fn test_metadata() {

src/error.rs

@@ -14,7 +14,7 @@
 
 //! Error and Result of ttrpc and relevant functions, macros.
 
-use crate::ttrpc::{Code, Status};
+use crate::proto::{Code, Status};
 use std::result;
 use thiserror::Error;
 

src/lib.rs

@@ -52,7 +52,7 @@ mod common;
 mod compiled {
     include!(concat!(env!("OUT_DIR"), "/mod.rs"));
 }
-pub use compiled::ttrpc;
+pub use compiled::ttrpc as proto;
 
 pub mod context;
 
@@ -61,7 +61,7 @@ pub use crate::common::MessageHeader;
 #[doc(inline)]
 pub use crate::error::{get_status, Error, Result};
 #[doc(inline)]
-pub use crate::ttrpc::{Code, Request, Response, Status};
+pub use proto::{Code, Request, Response, Status};
 
 cfg_sync! {
     pub mod sync;

src/sync/channel.rs

@@ -18,7 +18,7 @@ use std::os::unix::io::RawFd;
 
 use crate::common::{MESSAGE_HEADER_LENGTH, MESSAGE_LENGTH_MAX};
 use crate::error::{get_rpc_status, sock_error_msg, Error, Result};
-use crate::ttrpc::Code;
+use crate::proto::Code;
 use crate::MessageHeader;
 
 fn retryable(e: nix::Error) -> bool {