fix: clippy

Author: Randoooom

codegen/src/lib.rs

@@ -29,14 +29,14 @@ use syn::{
     parse_macro_input, DeriveInput, GenericArgument, Ident, ItemFn, PathArguments, ReturnType, Type,
 };
 
-#[proc_macro_derive(IntoPageRequest)]
-pub fn into_page_request_derive(input: TokenStream) -> TokenStream {
+#[proc_macro_derive(PageRequest)]
+pub fn page_request_derive(input: TokenStream) -> TokenStream {
     let input: DeriveInput = parse_macro_input!(input as DeriveInput);
     let ident = &input.ident;
 
     let expanded = quote! {
-        impl crate::IntoPageRequest for #ident {
-            fn into_page_request(&self) -> rbatis::plugin::page::PageRequest {
+        impl crate::PageRequest for #ident {
+            fn page_request(&self) -> rbatis::plugin::page::PageRequest {
                 let page_size = if self.page_size > 0 { self.page_size as u64 } else { 20 };
                 let page = if self.page_token > 0 { self.page_token as u64 } else { 1 };
 
@@ -172,7 +172,7 @@ pub fn dynamic_cache(arguments: TokenStream, input: TokenStream) -> TokenStream
     let skytable_tls_type = proc_macro2::TokenStream::from_str(
         format!(
             "\"crate::cache::SkytableCache<skytable::pool::ConnectionMgrTls, String, {}>\"",
-            inner_type.to_token_stream().to_string()
+            inner_type.to_token_stream()
         )
         .as_str(),
     )
@@ -205,7 +205,7 @@ pub fn dynamic_cache(arguments: TokenStream, input: TokenStream) -> TokenStream
     let skytable_type = proc_macro2::TokenStream::from_str(
         format!(
             "\"crate::cache::SkytableCache<skytable::pool::ConnectionMgrTcp, String, {}>\"",
-            inner_type.to_token_stream().to_string()
+            inner_type.to_token_stream()
         )
         .as_str(),
     )

common/build.rs

@@ -130,19 +130,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         )
         .type_attribute(
             "GetTargetsRequest",
-            "#[derive(feedback_fusion_codegen::IntoPageRequest)]",
+            "#[derive(feedback_fusion_codegen::PageRequest)]",
         )
         .type_attribute(
             "GetPromptsRequest",
-            "#[derive(feedback_fusion_codegen::IntoPageRequest)]",
+            "#[derive(feedback_fusion_codegen::PageRequest)]",
         )
         .type_attribute(
             "GetFieldsRequest",
-            "#[derive(feedback_fusion_codegen::IntoPageRequest)]",
+            "#[derive(feedback_fusion_codegen::PageRequest)]",
         )
         .type_attribute(
             "GetResponsesRequest",
-            "#[derive(feedback_fusion_codegen::IntoPageRequest)]",
+            "#[derive(feedback_fusion_codegen::PageRequest)]",
         )
         .file_descriptor_set_path(out_dir.join("feedback-fusion-v1-descriptor.bin"))
         .compile(&["../proto/feedback-fusion-v1.proto"], &["../proto"])

common/src/lib.rs

@@ -29,6 +29,6 @@ pub mod proto {
         tonic::include_file_descriptor_set!("feedback-fusion-v1-descriptor");
 }
 
-pub trait IntoPageRequest {
-    fn into_page_request(&self) -> rbatis::plugin::page::PageRequest;
+pub trait PageRequest {
+    fn page_request(&self) -> rbatis::plugin::page::PageRequest;
 }

src/cache.rs

@@ -270,7 +270,7 @@ pub struct SkytableCache<'a, C: ManageConnection, K, V> {
 }
 
 #[cfg(feature = "caching-skytable")]
-impl<'a, C, I, S, K, V> SkytableCache<'a, C, K, V>
+impl<C, I, S, K, V> SkytableCache<'_, C, K, V>
 where
     S: AsyncRead + AsyncWrite + Send + Sync + Unpin,
     I: DerefMut<Target = TcpConnection<S>> + Send + Sync,

src/main.rs

@@ -163,7 +163,7 @@ pub mod prelude {
         services::{oidc::*, *},
     };
     pub use derivative::Derivative;
-    pub use feedback_fusion_common::IntoPageRequest;
+    pub use feedback_fusion_common::PageRequest;
     pub use getset::{Getters, MutGetters, Setters};
     pub use itertools::Itertools;
     pub use lazy_static::lazy_static;

src/services/v1/field.rs

@@ -63,7 +63,7 @@ pub async fn get_active_fields(
     request: Request<GetFieldsRequest>,
 ) -> Result<Response<FieldPage>> {
     let data = request.into_inner();
-    let page_request = data.into_page_request();
+    let page_request = data.page_request();
     let connection = context.connection();
 
     // fetch the prompt
@@ -102,7 +102,7 @@ pub async fn get_fields(
     request: Request<GetFieldsRequest>,
 ) -> Result<Response<FieldPage>> {
     let data = request.into_inner();
-    let page_request = data.into_page_request();
+    let page_request = data.page_request();
 
     let page = database_request!(
         Field::select_page_by_prompt_wrapper(

src/services/v1/prompt.rs

@@ -72,7 +72,7 @@ pub async fn get_prompts(
     request: Request<GetPromptsRequest>,
 ) -> Result<Response<PromptPage>> {
     let data = request.into_inner();
-    let page_request = data.into_page_request();
+    let page_request = data.page_request();
     let connection = context.connection();
 
     let prompts = database_request!(

src/services/v1/response.rs

@@ -115,7 +115,7 @@ pub async fn get_responses(
     request: Request<GetResponsesRequest>,
 ) -> Result<Response<ResponsePage>> {
     let data = request.into_inner();
-    let page_request = data.into_page_request();
+    let page_request = data.page_request();
     let connection = context.connection();
 
     // select a page of responses

src/services/v1/target.rs

@@ -72,7 +72,7 @@ pub async fn get_targets(
     request: Request<GetTargetsRequest>,
 ) -> Result<Response<TargetPage>> {
     let data = request.into_inner();
-    let page_request = data.into_page_request();
+    let page_request = data.page_request();
     let connection = context.connection();
 
     // TODO: write translation macro