bump: upgrade 0.5.0, rust-edition=2024, MSRV=1.80 (#255)

- 增强: rust-edition=2024, MSRV=1.80
- 增强: ConfigService / NamingService 改为 struct 而无需 Box 包裹

Author: CherishCai

CHANGELOG.md

@@ -1,5 +1,16 @@
 # 变更日志 | Change log
 
+### 0.5.0
+
+- 增强: rust-edition=2024, MSRV=1.80
+- 增强: ConfigService / NamingService 改为 struct 而无需 Box<dyn> 包裹
+
+---
+
+- Enhance: rust-edition=2024, MSRV=1.80
+- Enhance: ConfigService / NamingService changed to struct without Box<dyn> wrapping
+
+
 ### 0.4.3
 
 - 功能: 提供 Aliyun ram AuthPlugin (#245)，通过 `features = ["auth-by-aliyun"]` 开启

Cargo.toml

@@ -18,8 +18,8 @@
 
 [package]
 name = "nacos-sdk"
-version = "0.4.3"
-edition = "2021"
+version = "0.5.0"
+edition = "2024"
 authors = ["nacos-group", "CheirshCai <[email protected]>", "onewe <[email protected]>"]
 license = "Apache-2.0"
 readme = "README.md"

README.md

@@ -23,7 +23,7 @@ Add the dependency in `Cargo.toml`:
 ```toml
 [dependencies]
 # If you need sync API, maybe `futures::executor::block_on(future_fn)`
-nacos-sdk = { version = "0.4", features = ["default"] }
+nacos-sdk = { version = "0.5", features = ["default"] }
 ```
 
 ### Usage of Config

examples/aliyun_ram_app.rs

@@ -1,5 +1,5 @@
-use nacos_sdk::api::config::{ConfigService, ConfigServiceBuilder};
-use nacos_sdk::api::naming::{NamingService, NamingServiceBuilder, ServiceInstance};
+use nacos_sdk::api::config::ConfigServiceBuilder;
+use nacos_sdk::api::naming::{NamingServiceBuilder, ServiceInstance};
 use nacos_sdk::api::props::ClientProps;
 use std::time::Duration;
 use tokio::time::sleep;
@@ -33,7 +33,7 @@ async fn run_naming_demo() {
     let server_addr = "localhost:8848";
 
     /// NamingService
-    let mut naming_client = NamingServiceBuilder::new(ClientProps::new().server_addr(server_addr))
+    let naming_client = NamingServiceBuilder::new(ClientProps::new().server_addr(server_addr))
         .enable_auth_plugin_aliyun()
         .build()
         .unwrap();
@@ -68,7 +68,7 @@ async fn run_config_demo() {
     let server_addr = "localhost:8848";
 
     /// Config service
-    let mut config_client = ConfigServiceBuilder::new(ClientProps::new().server_addr(server_addr))
+    let config_client = ConfigServiceBuilder::new(ClientProps::new().server_addr(server_addr))
         .enable_auth_plugin_aliyun()
         .build()
         .unwrap();

examples/lazy_app.rs

@@ -22,22 +22,22 @@ static CLIENT_PROPS: LazyLock<ClientProps> = LazyLock::new(|| {
 
 // 请注意！一般情况下，应用下仅需一个 Config 客户端，而且需要长期持有直至应用停止。
 // 因为它内部会初始化与服务端的长链接，后续的数据交互及变更订阅，都是实时地通过长链接告知客户端的。
-static CONFIG_SERVICE: LazyLock<Box<dyn ConfigService>> = LazyLock::new(|| {
+static CONFIG_SERVICE: LazyLock<ConfigService> = LazyLock::new(|| {
     let config_service = ConfigServiceBuilder::new(CLIENT_PROPS.clone())
         .enable_auth_plugin_http() // TODO You can choose not to enable auth
         .build()
         .unwrap();
-    Box::new(config_service)
+    config_service
 });
 
 // 请注意！一般情况下，应用下仅需一个 Naming 客户端，而且需要长期持有直至应用停止。
 // 因为它内部会初始化与服务端的长链接，后续的数据交互及变更订阅，都是实时地通过长链接告知客户端的。
-static NAMING_SERVICE: LazyLock<Box<dyn NamingService>> = LazyLock::new(|| {
+static NAMING_SERVICE: LazyLock<NamingService> = LazyLock::new(|| {
     let naming_service = NamingServiceBuilder::new(CLIENT_PROPS.clone())
         .enable_auth_plugin_http() // TODO You can choose not to enable auth
         .build()
         .unwrap();
-    Box::new(naming_service)
+    naming_service
 });
 
 /// enable https auth run with command:

examples/simple_app.rs

@@ -1,9 +1,7 @@
-use nacos_sdk::api::config::{
-    ConfigChangeListener, ConfigResponse, ConfigService, ConfigServiceBuilder,
-};
+use nacos_sdk::api::config::{ConfigChangeListener, ConfigResponse, ConfigServiceBuilder};
 use nacos_sdk::api::constants;
 use nacos_sdk::api::naming::{
-    NamingChangeEvent, NamingEventListener, NamingService, NamingServiceBuilder, ServiceInstance,
+    NamingChangeEvent, NamingEventListener, NamingServiceBuilder, ServiceInstance,
 };
 use nacos_sdk::api::props::ClientProps;
 

src/_.rs

@@ -1,5 +1,4 @@
 // This file is @generated by prost-build.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Metadata {
     #[prost(string, tag = "3")]
@@ -10,7 +9,6 @@ pub struct Metadata {
     pub headers:
         ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
 }
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Payload {
     #[prost(message, optional, tag = "2")]
@@ -20,7 +18,13 @@ pub struct Payload {
 }
 /// Generated client implementations.
 pub mod request_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value
+    )]
     use tonic::codegen::http::Uri;
     use tonic::codegen::*;
     #[derive(Debug, Clone)]
@@ -42,8 +46,8 @@ pub mod request_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -61,13 +65,13 @@ pub mod request_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    http::Request<tonic::body::BoxBody>,
+                    Response = http::Response<
+                        <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    >,
                 >,
-            >,
             <T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
-                Into<StdError> + Send + Sync,
+                Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             RequestClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -108,10 +112,7 @@ pub mod request_client {
             request: impl tonic::IntoRequest<super::Payload>,
         ) -> std::result::Result<tonic::Response<super::Payload>, tonic::Status> {
             self.inner.ready().await.map_err(|e| {
-                tonic::Status::new(
-                    tonic::Code::Unknown,
-                    format!("Service was not ready: {}", e.into()),
-                )
+                tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/Request/request");
@@ -124,7 +125,13 @@ pub mod request_client {
 }
 /// Generated client implementations.
 pub mod bi_request_stream_client {
-    #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value
+    )]
     use tonic::codegen::http::Uri;
     use tonic::codegen::*;
     #[derive(Debug, Clone)]
@@ -146,8 +153,8 @@ pub mod bi_request_stream_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -165,13 +172,13 @@ pub mod bi_request_stream_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    http::Request<tonic::body::BoxBody>,
+                    Response = http::Response<
+                        <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    >,
                 >,
-            >,
             <T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
-                Into<StdError> + Send + Sync,
+                Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             BiRequestStreamClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -215,10 +222,7 @@ pub mod bi_request_stream_client {
             tonic::Status,
         > {
             self.inner.ready().await.map_err(|e| {
-                tonic::Status::new(
-                    tonic::Code::Unknown,
-                    format!("Service was not ready: {}", e.into()),
-                )
+                tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
             })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/BiRequestStream/requestBiStream");