You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ya...@apache.org on 2023/04/22 13:12:09 UTC
[dubbo-rust] branch main updated: Fix/compile error (#134)
This is an automated email from the ASF dual-hosted git repository.
yangyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-rust.git
The following commit(s) were added to refs/heads/main by this push:
new e826271 Fix/compile error (#134)
e826271 is described below
commit e8262713e5f2e84a64171f348dd45528acdee856
Author: Yang Yang <96...@qq.com>
AuthorDate: Sat Apr 22 21:12:03 2023 +0800
Fix/compile error (#134)
* fix: compile error
* style: cargo fmt
* refactor(remoting): add import
---------
Signed-off-by: yangyang <96...@qq.com>
---
dubbo/Cargo.toml | 1 -
dubbo/src/triple/server/builder.rs | 5 ++---
dubbo/src/triple/transport/service.rs | 17 ++++++++---------
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/dubbo/Cargo.toml b/dubbo/Cargo.toml
index 8b4b1aa..94a2bd8 100644
--- a/dubbo/Cargo.toml
+++ b/dubbo/Cargo.toml
@@ -21,7 +21,6 @@ argh = "0.1"
rustls-pemfile = "1.0.0"
tokio-rustls="0.23.4"
tokio = { version = "1.0", features = [ "rt-multi-thread", "time", "fs", "macros", "net", "signal", "full" ] }
-futures-core = "0.3.23"
prost = "0.10.4"
async-trait = "0.1.56"
tower-layer.workspace = true
diff --git a/dubbo/src/triple/server/builder.rs b/dubbo/src/triple/server/builder.rs
index c85f83b..9ef7152 100644
--- a/dubbo/src/triple/server/builder.rs
+++ b/dubbo/src/triple/server/builder.rs
@@ -25,11 +25,10 @@ use dubbo_base::Url;
use dubbo_logger::tracing;
use http::{Request, Response, Uri};
use hyper::body::Body;
-use tower_service::Service;
use tokio_rustls::rustls::{Certificate, PrivateKey};
+use tower_service::Service;
-use crate::{common::url::Url, triple::transport::DubboServer};
-use crate::{utils, BoxBody};
+use crate::{triple::transport::DubboServer, utils, BoxBody};
#[derive(Clone, Default, Debug)]
pub struct ServerBuilder {
diff --git a/dubbo/src/triple/transport/service.rs b/dubbo/src/triple/transport/service.rs
index 14afabf..11eca26 100644
--- a/dubbo/src/triple/transport/service.rs
+++ b/dubbo/src/triple/transport/service.rs
@@ -15,23 +15,22 @@
* limitations under the License.
*/
-use std::io;
-use std::net::SocketAddr;
-use std::sync::Arc;
+use std::{io, net::SocketAddr, sync::Arc};
use dubbo_logger::tracing;
use futures_core::Future;
use http::{Request, Response};
use hyper::body::Body;
use tokio::time::Duration;
+use tokio_rustls::{
+ rustls,
+ rustls::{Certificate, PrivateKey},
+ TlsAcceptor,
+};
use tower_service::Service;
-use tokio_rustls::rustls::{Certificate, PrivateKey};
-use tokio_rustls::{rustls, TlsAcceptor};
-use super::listener::get_listener;
-use super::router::DubboRouter;
-use crate::triple::transport::io::BoxIO;
-use crate::BoxBody;
+use super::{listener::get_listener, router::DubboRouter};
+use crate::{triple::transport::io::BoxIO, BoxBody};
#[derive(Default, Clone, Debug)]
pub struct DubboServer {