Fix clippy issues (#92)

src/auth/authenticate.rs

@@ -26,9 +26,9 @@ impl From<etcdserverpb::AuthenticateRequest> for AuthenticateRequest {
     }
 }
 
-impl Into<etcdserverpb::AuthenticateRequest> for AuthenticateRequest {
-    fn into(self) -> etcdserverpb::AuthenticateRequest {
-        self.proto
+impl From<AuthenticateRequest> for etcdserverpb::AuthenticateRequest {
+    fn from(value: AuthenticateRequest) -> Self {
+        value.proto
     }
 }
 

src/client.rs

@@ -26,7 +26,6 @@ use crate::lease::{
 };
 use crate::proto::etcdserverpb;
 use crate::proto::etcdserverpb::cluster_client::ClusterClient;
-use crate::proto::etcdserverpb::maintenance_client::MaintenanceClient;
 use crate::proto::etcdserverpb::LeaseKeepAliveRequest;
 use crate::proto::etcdserverpb::{
     auth_client::AuthClient, kv_client::KvClient, lease_client::LeaseClient,
@@ -184,7 +183,6 @@ pub struct Client {
     kv_client: KvClient<InterceptedService<Channel, TokenInterceptor>>,
     watch_client: WatchClient<InterceptedService<Channel, TokenInterceptor>>,
     cluster_client: ClusterClient<InterceptedService<Channel, TokenInterceptor>>,
-    maintenance_client: MaintenanceClient<InterceptedService<Channel, TokenInterceptor>>,
     lease_client: LeaseClient<InterceptedService<Channel, TokenInterceptor>>,
 }
 
@@ -200,16 +198,13 @@ impl Client {
         let watch_client = WatchClient::with_interceptor(channel.clone(), auth_interceptor.clone());
         let cluster_client =
             ClusterClient::with_interceptor(channel.clone(), auth_interceptor.clone());
-        let maintenance_client =
-            MaintenanceClient::with_interceptor(channel.clone(), auth_interceptor.clone());
         let lease_client = LeaseClient::with_interceptor(channel, auth_interceptor);
 
         Self {
             auth_client,
             kv_client,
             watch_client,
             cluster_client,
-            maintenance_client,
             lease_client,
         }
     }

src/cluster/member_list.rs

@@ -24,6 +24,12 @@ impl From<MemberListRequest> for etcdserverpb::MemberListRequest {
     }
 }
 
+impl Default for MemberListRequest {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct MemberListResponse {
     pub header: ResponseHeader,

src/cluster/mod.rs

@@ -51,14 +51,14 @@ impl From<etcdserverpb::Member> for Member {
     }
 }
 
-impl Into<etcdserverpb::Member> for Member {
-    fn into(self) -> etcdserverpb::Member {
+impl From<Member> for etcdserverpb::Member {
+    fn from(value: Member) -> Self {
         etcdserverpb::Member {
-            id: self.id,
-            name: self.name,
-            peer_ur_ls: self.peer_urls,
-            client_ur_ls: self.client_urls,
-            is_learner: self.is_learner,
+            id: value.id,
+            name: value.name,
+            peer_ur_ls: value.peer_urls,
+            client_ur_ls: value.client_urls,
+            is_learner: value.is_learner,
         }
     }
 }

src/kv/delete.rs

@@ -39,9 +39,9 @@ where
     }
 }
 
-impl Into<etcdserverpb::DeleteRangeRequest> for DeleteRequest {
-    fn into(self) -> etcdserverpb::DeleteRangeRequest {
-        self.proto
+impl From<DeleteRequest> for etcdserverpb::DeleteRangeRequest {
+    fn from(value: DeleteRequest) -> Self {
+        value.proto
     }
 }
 

src/kv/put.rs

@@ -30,7 +30,7 @@ impl PutRequest {
     /// Sets the lease ID to associate with the key in the key-value store.
     /// A lease value of 0 indicates no lease.
     pub fn lease(mut self, lease: LeaseId) -> Self {
-        self.proto.lease = lease as i64;
+        self.proto.lease = lease;
         self
     }
 

src/kv/range.rs

@@ -75,18 +75,18 @@ pub enum SortOrder {
     Descending,
 }
 
-impl Into<etcdserverpb::range_request::SortOrder> for SortOrder {
-    fn into(self) -> etcdserverpb::range_request::SortOrder {
-        match self {
+impl From<SortOrder> for etcdserverpb::range_request::SortOrder {
+    fn from(value: SortOrder) -> Self {
+        match value {
             SortOrder::Ascending => etcdserverpb::range_request::SortOrder::Ascend,
             SortOrder::Descending => etcdserverpb::range_request::SortOrder::Descend,
         }
     }
 }
 
-impl Into<i32> for SortOrder {
-    fn into(self) -> i32 {
-        let order: etcdserverpb::range_request::SortOrder = self.into();
+impl From<SortOrder> for i32 {
+    fn from(value: SortOrder) -> Self {
+        let order: etcdserverpb::range_request::SortOrder = value.into();
         order as i32
     }
 }

src/lease/mod.rs

@@ -71,9 +71,6 @@ impl LeaseKeepAlive {
             .await
             .map_err(|_| Error::ChannelClosed)?;
 
-        Ok(match self.resp_rx.message().await? {
-            Some(resp) => Some(resp.into()),
-            None => None,
-        })
+        Ok(self.resp_rx.message().await?.map(|resp| resp.into()))
     }
 }

src/lib.rs

@@ -46,7 +46,6 @@ mod error;
 mod kv;
 mod lease;
 mod lock;
-mod maintenance;
 mod proto;
 mod response_header;
 mod watch;

src/proto.rs

@@ -1,19 +1,24 @@
+#[allow(warnings)]
 pub mod mvccpb {
     tonic::include_proto!("mvccpb");
 }
 
+#[allow(warnings)]
 pub mod authpb {
     tonic::include_proto!("authpb");
 }
 
+#[allow(warnings)]
 pub mod etcdserverpb {
     tonic::include_proto!("etcdserverpb");
 }
 
+#[allow(warnings)]
 pub mod v3lockpb {
     tonic::include_proto!("v3lockpb");
 }
 
+#[allow(warnings)]
 pub mod v3electionpb {
     tonic::include_proto!("v3electionpb");
 }

src/watch/mod.rs

@@ -98,7 +98,7 @@ impl WatchCanceler {
         self.tx
             .send(WatchCancelRequest::new(self.watch_id).into())
             .await
-            .map_err(|e| Error::WatchChannelSend(e))
+            .map_err(Error::WatchChannelSend)
     }
 }
 

src/watch/watch.rs

@@ -41,16 +41,17 @@ impl WatchCreateRequest {
         self
     }
 }
-impl Into<etcdserverpb::WatchCreateRequest> for WatchCreateRequest {
-    fn into(self) -> etcdserverpb::WatchCreateRequest {
-        self.proto
+
+impl From<WatchCreateRequest> for etcdserverpb::WatchCreateRequest {
+    fn from(value: WatchCreateRequest) -> Self {
+        value.proto
     }
 }
 
-impl Into<etcdserverpb::WatchRequest> for WatchCreateRequest {
-    fn into(self) -> etcdserverpb::WatchRequest {
+impl From<WatchCreateRequest> for etcdserverpb::WatchRequest {
+    fn from(value: WatchCreateRequest) -> Self {
         etcdserverpb::WatchRequest {
-            request_union: Some(RequestUnion::CreateRequest(self.into())),
+            request_union: Some(RequestUnion::CreateRequest(value.into())),
         }
     }
 }
@@ -81,16 +82,16 @@ impl From<i64> for WatchCancelRequest {
     }
 }
 
-impl Into<etcdserverpb::WatchCancelRequest> for WatchCancelRequest {
-    fn into(self) -> etcdserverpb::WatchCancelRequest {
-        self.proto
+impl From<WatchCancelRequest> for etcdserverpb::WatchCancelRequest {
+    fn from(value: WatchCancelRequest) -> Self {
+        value.proto
     }
 }
 
-impl Into<etcdserverpb::WatchRequest> for WatchCancelRequest {
-    fn into(self) -> etcdserverpb::WatchRequest {
+impl From<WatchCancelRequest> for etcdserverpb::WatchRequest {
+    fn from(value: WatchCancelRequest) -> Self {
         etcdserverpb::WatchRequest {
-            request_union: Some(RequestUnion::CancelRequest(self.into())),
+            request_union: Some(RequestUnion::CancelRequest(value.into())),
         }
     }
 }