cilppy(backend): cargo clippy and some manual fix

backend/src/endpoint/announcement.rs

@@ -1,6 +1,6 @@
 use super::tools::*;
 
-use grpc::{backend::announcement_server::*, backend::*};
+use grpc::backend::announcement_server::*;
 
 use crate::{
     entity::announcement::{Paginator, *},
@@ -13,11 +13,11 @@ impl From<Model> for AnnouncementFullInfo {
     fn from(value: Model) -> Self {
         AnnouncementFullInfo {
             info: AnnouncementInfo {
-                id: value.id.into(),
+                id: value.id,
                 title: value.title,
                 update_date: into_prost(value.update_at),
             },
-            author_id: value.user_id.into(),
+            author_id: value.user_id,
             content: value.content,
             public: value.public,
         }
@@ -27,7 +27,7 @@ impl From<Model> for AnnouncementFullInfo {
 impl From<Model> for AnnouncementInfo {
     fn from(value: Model) -> Self {
         AnnouncementInfo {
-            id: value.id.into(),
+            id: value.id,
             title: value.title,
             update_date: into_prost(value.update_at),
         }
@@ -37,7 +37,7 @@ impl From<Model> for AnnouncementInfo {
 impl From<PartialModel> for AnnouncementInfo {
     fn from(value: PartialModel) -> Self {
         AnnouncementInfo {
-            id: value.id.into(),
+            id: value.id,
             title: value.title,
             update_date: into_prost(value.update_at),
         }
@@ -53,7 +53,7 @@ impl Announcement for ArcServer {
     ) -> Result<Response<ListAnnouncementResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/endpoint/chat.rs

@@ -1,15 +1,15 @@
 use super::tools::*;
 
-use grpc::{backend::chat_server::*, backend::*};
+use grpc::backend::chat_server::*;
 
 use crate::entity::chat::{Paginator, *};
 
 impl From<Model> for ChatInfo {
     fn from(value: Model) -> Self {
         ChatInfo {
-            id: value.id.into(),
-            user_id: value.user_id.into(),
-            problem_id: value.problem_id.into(),
+            id: value.id,
+            user_id: value.user_id,
+            problem_id: value.problem_id,
             create_at: into_prost(value.create_at),
             message: value.message,
         }
@@ -80,7 +80,7 @@ impl Chat for ArcServer {
     ) -> Result<Response<ListChatResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/endpoint/contest.rs

@@ -6,22 +6,21 @@ use crate::entity::{
 };
 
 use grpc::backend::contest_server::*;
-use grpc::backend::*;
 
 impl From<Model> for ContestFullInfo {
     fn from(value: Model) -> Self {
         ContestFullInfo {
             info: value.clone().into(),
             content: value.content,
-            host: value.hoster.into(),
+            host: value.hoster,
         }
     }
 }
 
 impl From<user_contest::Model> for UserRank {
     fn from(value: user_contest::Model) -> Self {
         UserRank {
-            user_id: value.user_id.into(),
+            user_id: value.user_id,
             score: value.score,
         }
     }
@@ -30,7 +29,7 @@ impl From<user_contest::Model> for UserRank {
 impl From<Model> for ContestInfo {
     fn from(value: Model) -> Self {
         ContestInfo {
-            id: value.id.into(),
+            id: value.id,
             title: value.title,
             begin: into_prost(value.begin),
             end: into_prost(value.end),
@@ -42,7 +41,7 @@ impl From<Model> for ContestInfo {
 impl From<PartialModel> for ContestInfo {
     fn from(value: PartialModel) -> Self {
         ContestInfo {
-            id: value.id.into(),
+            id: value.id,
             title: value.title,
             begin: into_prost(value.begin),
             end: into_prost(value.end),
@@ -60,7 +59,7 @@ impl Contest for ArcServer {
     ) -> Result<Response<ListContestResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/endpoint/education.rs

@@ -1,15 +1,14 @@
 use super::tools::*;
 
 use grpc::backend::education_server::*;
-use grpc::backend::*;
 
 use crate::entity::{education::Paginator, education::*, *};
 
 impl From<Model> for EducationFullInfo {
     fn from(value: Model) -> Self {
         EducationFullInfo {
             info: EducationInfo {
-                id: value.id.into(),
+                id: value.id,
                 title: value.title,
             },
             content: value.content,
@@ -20,7 +19,7 @@ impl From<Model> for EducationFullInfo {
 impl From<PartialModel> for EducationInfo {
     fn from(value: PartialModel) -> Self {
         EducationInfo {
-            id: value.id.into(),
+            id: value.id,
             title: value.title,
         }
     }
@@ -34,7 +33,7 @@ impl Education for ArcServer {
     ) -> Result<Response<ListEducationResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/endpoint/imgur.rs

@@ -1,7 +1,6 @@
 use super::tools::*;
 
 use grpc::backend::image_server::*;
-use grpc::backend::*;
 
 #[async_trait]
 impl Image for ArcServer {

backend/src/endpoint/mod.rs

@@ -17,7 +17,7 @@ mod user;
 
 mod tools {
     pub use crate::NonZeroU32;
-    pub use grpc::backend::{Id, Order};
+    pub use grpc::backend::*;
     pub use sea_orm::*;
     pub use std::ops::Deref;
     pub use tonic::*;
@@ -35,10 +35,7 @@ mod tools {
         error::{atomic_fail, Error},
         time::*,
     };
-    pub use crate::{
-        fill_active_model, fill_exist_active_model, parse_pager_param, server::ArcServer,
-        TonicStream,
-    };
+    pub use crate::{fill_active_model, fill_exist_active_model, server::ArcServer, TonicStream};
 }
 
 // FIXME: currently we report transaction error as internal error,

backend/src/endpoint/playground.rs

@@ -1,7 +1,5 @@
 use super::tools::*;
 
-use crate::controller::judger::PlaygroundPayload;
-
 use grpc::backend::playground_server::*;
 use grpc::backend::*;
 

backend/src/endpoint/problem.rs

@@ -1,14 +1,12 @@
 use super::tools::*;
 use grpc::backend::problem_server::*;
-use grpc::backend::*;
 
 use crate::entity::{problem::Paginator, problem::*, *};
-use list_problem_request::Sort;
 
 impl From<PartialModel> for ProblemInfo {
     fn from(value: PartialModel) -> Self {
         ProblemInfo {
-            id: value.id.into(),
+            id: value.id,
             title: value.title,
             submit_count: value.submit_count,
             ac_rate: value.ac_rate,
@@ -27,13 +25,13 @@ impl From<Model> for ProblemFullInfo {
             time: value.time as u64,
             memory: value.memory as u64,
             info: ProblemInfo {
-                id: value.id.into(),
+                id: value.id,
                 title: value.title,
                 submit_count: value.submit_count,
                 ac_rate: value.ac_rate,
                 difficulty: value.difficulty,
             },
-            author: value.user_id.into(),
+            author: value.user_id,
         }
     }
 }
@@ -47,7 +45,7 @@ impl Problem for ArcServer {
     ) -> Result<Response<ListProblemResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/endpoint/submit.rs

@@ -4,7 +4,6 @@ use crate::controller::judger::SubmitBuilder;
 use crate::util::code::Code;
 use grpc::backend::submit_server::*;
 use grpc::backend::StateCode as BackendCode;
-use grpc::backend::*;
 
 use crate::entity::{
     submit::{Paginator, *},
@@ -19,7 +18,7 @@ impl From<Model> for SubmitInfo {
         // TODO: solve devation and uncommitted submit!
         let db_code: Code = value.status.unwrap().try_into().unwrap();
         SubmitInfo {
-            id: value.id.into(),
+            id: value.id,
             upload_time: into_prost(value.upload_at),
             score: value.score,
             state: JudgeResult {
@@ -37,7 +36,7 @@ impl From<PartialModel> for SubmitInfo {
         // TODO: solve devation and uncommitted submit!
         let db_code: Code = value.status.unwrap().try_into().unwrap();
         SubmitInfo {
-            id: value.id.into(),
+            id: value.id,
             upload_time: into_prost(value.upload_at),
             score: value.score,
             state: JudgeResult {
@@ -59,7 +58,7 @@ impl Submit for ArcServer {
     ) -> Result<Response<ListSubmitResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/endpoint/testcase.rs

@@ -1,14 +1,13 @@
 use super::tools::*;
 
 use grpc::backend::testcase_server::*;
-use grpc::backend::*;
 
 use crate::entity::{testcase::*, *};
 
 impl From<Model> for TestcaseFullInfo {
     fn from(value: Model) -> Self {
         TestcaseFullInfo {
-            id: value.id.into(),
+            id: value.id,
             score: value.score,
             inputs: value.input,
             outputs: value.output,
@@ -19,7 +18,7 @@ impl From<Model> for TestcaseFullInfo {
 impl From<Model> for TestcaseInfo {
     fn from(value: Model) -> Self {
         TestcaseInfo {
-            id: value.id.into(),
+            id: value.id,
             score: value.score,
         }
     }

backend/src/endpoint/token.rs

@@ -3,7 +3,6 @@ use std::time::Duration;
 use super::tools::*;
 
 use grpc::backend::token_server::*;
-use grpc::backend::*;
 
 use crate::entity::token::*;
 use crate::entity::*;
@@ -75,7 +74,7 @@ impl Token for ArcServer {
             let (token, expiry) = self.token.add(&model, dur).in_current_span().await?;
 
             Ok(Response::new(TokenInfo {
-                token: token.into(),
+                token,
                 role: model.permission,
                 expiry: into_prost(expiry),
             }))
@@ -116,7 +115,7 @@ impl Token for ArcServer {
 
             let (token, expiry) = self.token.add(&user, dur).in_current_span().await?;
             return Ok(Response::new(TokenInfo {
-                token: token.into(),
+                token,
                 role: perm as i32,
                 expiry: into_prost(expiry),
             }));

backend/src/endpoint/user.rs

@@ -1,6 +1,6 @@
 use super::tools::*;
 
-use grpc::{backend::user_server::*, backend::*};
+use grpc::backend::user_server::*;
 
 use crate::{
     entity::user,
@@ -13,7 +13,7 @@ impl From<Model> for UserInfo {
             username: value.username,
             // FIXME: capture Error(database corruption?) instead!
             score: value.score.try_into().unwrap_or_default(),
-            id: value.id.into(),
+            id: value.id,
         }
     }
 }
@@ -27,7 +27,7 @@ impl User for ArcServer {
     ) -> Result<Response<ListUserResponse>, Status> {
         let (auth, req) = self
             .parse_request_fn(req, |req| {
-                ((req.size as u64) + req.offset.saturating_abs() as u64 / 5 + 2)
+                (req.size + req.offset.saturating_abs() as u64 / 5 + 2)
                     .try_into()
                     .unwrap_or(u32::MAX)
             })

backend/src/entity/user.rs

@@ -281,7 +281,7 @@ impl util::paginator::PaginateRaw for ParentPaginator {
                 to_order(self.start_from_end ^ dir),
             )
             .offset(self.offset + offset)
-            .limit(size.abs() as u64)
+            .limit(size.unsigned_abs())
             .all(db)
             .await?;
 
@@ -382,6 +382,9 @@ impl Paginator {
             start_from_end,
         ))
     }
+    pub fn new(start_from_end: bool) -> Self {
+        Self::new_sort(Sort::Score, start_from_end)
+    }
 }
 
 impl<'a, 'b> WithDB<'a, WithAuth<'b, Paginator>> {

backend/src/entity/util/paginator.rs

@@ -157,7 +157,7 @@ impl<S: Source, R: Reflect<S::Entity>> PaginateRaw for PrimaryKeyPaginator<S, R>
 
         let query = paginator
             .apply(S::filter(auth, &self.data, db).await?)
-            .limit(size.abs() as u64)
+            .limit(size.unsigned_abs())
             .offset(offset);
         let models = R::all(query, db).await?;
 
@@ -295,7 +295,7 @@ impl<S: SortSource<R>, R: Reflect<S::Entity>> PaginateRaw for ColumnPaginator<S,
 
         let query = paginator
             .apply(S::filter(auth, &self.data, db).await?)
-            .limit(size.abs() as u64)
+            .limit(size.unsigned_abs())
             .offset(offset);
         let models = R::all(query, db)
             .instrument(debug_span!("query").or_current())

backend/src/entity/util/with.rs

@@ -1,6 +1,4 @@
-use crate::entity::problem::{Paginator, PartialModel};
 use crate::util::auth::Auth;
-use crate::util::error::Error;
 use sea_orm::DatabaseConnection;
 
 pub struct WithAuth<'a, T>(pub &'a Auth, pub T);