微修正

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
#
# Date:      Fri Apr 29 17:01:59 2022 +0900
#
# interactive rebase in progress; onto 58aed3e
# Last commands done (6 commands done):
#    edit dbd193b5 src/server/problem_list.rsを削除
#    edit 7f28b973 微修正
# No commands remaining.
# You are currently editing a commit while rebasing branch 'tweak' on '58aed3e8'.
#
# Changes to be committed:
#	modified:   src/server/user_submissions.rs
#
# Untracked files:
#	cargo-timing.html
#

Author: hotate29

atcoder-problems-backend/atcoder-client/src/atcoder/types.rs

@@ -64,7 +64,7 @@ mod tests {
             contest_id: "arc102".to_string(),
         };
         assert_eq!(
-            "https://atcoder.jp/contests/arc102/tasks/arc102_c".to_string(),
+            "https://atcoder.jp/contests/arc102/tasks/arc102_c",
             problem.url()
         );
     }

atcoder-problems-backend/sql-client/src/internal/problem_list_manager.rs

@@ -165,7 +165,7 @@ impl ProblemListManager for PgPool {
             ",
         )
         .bind(internal_user_id)
-        .bind(new_list_id.as_str())
+        .bind(&new_list_id)
         .bind(name)
         .execute(self)
         .await?;

atcoder-problems-backend/sql-client/tests/test_language_count.rs

@@ -255,13 +255,5 @@ async fn test_language_count() {
         ]
     );
     let languages = pool.load_languages().await.unwrap();
-    assert_eq!(
-        languages,
-        vec![
-            "language1".to_owned(),
-            "language2".to_owned(),
-            "Perl".to_owned(),
-            "Raku".to_owned(),
-        ]
-    );
+    assert_eq!(languages, ["language1", "language2", "Perl", "Raku"]);
 }

atcoder-problems-backend/sql-client/tests/test_simple_client.rs

@@ -18,7 +18,7 @@ async fn test_insert_contests() {
     .unwrap();
 
     let contests = pool.load_contests().await.unwrap();
-    assert_eq!(contests[0].id.as_str(), "contest1");
+    assert_eq!(contests[0].id, "contest1");
 
     pool.insert_contests(&[Contest {
         id: "contest1".to_string(),
@@ -46,7 +46,7 @@ async fn test_insert_problems() {
     .unwrap();
 
     let problems = pool.load_problems().await.unwrap();
-    assert_eq!(problems[0].id.as_str(), "problem1");
+    assert_eq!(problems[0].id, "problem1");
 
     pool.insert_problems(&[Problem {
         id: "problem1".to_string(),

atcoder-problems-backend/sql-client/tests/test_streak.rs

@@ -49,14 +49,14 @@ async fn test_streak_ranking() {
     // load streak count in range
     let rank_1st_to_3rd = pool.load_streak_count_in_range(0..3).await.unwrap();
     assert_eq!(rank_1st_to_3rd.len(), 3);
-    assert_eq!(rank_1st_to_3rd[0].user_id, "user1".to_owned());
+    assert_eq!(rank_1st_to_3rd[0].user_id, "user1");
     assert_eq!(rank_1st_to_3rd[0].streak, 2);
-    assert_eq!(rank_1st_to_3rd[2].user_id, "user3".to_owned());
+    assert_eq!(rank_1st_to_3rd[2].user_id, "user3");
     assert_eq!(rank_1st_to_3rd[2].streak, 1);
 
     let rank_3rd_to_4th = pool.load_streak_count_in_range(2..4).await.unwrap();
     assert_eq!(rank_3rd_to_4th.len(), 2);
-    assert_eq!(rank_3rd_to_4th[0].user_id, "user3".to_owned());
+    assert_eq!(rank_3rd_to_4th[0].user_id, "user3");
     assert_eq!(rank_3rd_to_4th[0].streak, 1);
     assert_eq!(
         rank_3rd_to_4th[1],

atcoder-problems-backend/sql-client/tests/test_submission_client.rs

@@ -79,8 +79,8 @@ async fn test_submission_client() {
     };
     let submissions = pool.get_submissions(request).await.unwrap();
     assert_eq!(submissions.len(), 2);
-    assert_eq!(submissions[0].result, "WA".to_owned());
-    assert_eq!(submissions[1].result, "AC".to_owned());
+    assert_eq!(submissions[0].result, "WA");
+    assert_eq!(submissions[1].result, "AC");
 
     let request = SubmissionRequest::FromUserAndTime {
         user_id: "usEr1",
@@ -149,8 +149,8 @@ async fn test_update_submissions() {
         .await
         .unwrap();
     assert_eq!(submissions.len(), 1);
-    assert_eq!(submissions[0].user_id, "old_user_name".to_owned());
-    assert_eq!(submissions[0].result, "WJ".to_owned());
+    assert_eq!(submissions[0].user_id, "old_user_name");
+    assert_eq!(submissions[0].result, "WJ");
     assert_eq!(submissions[0].point, 0.0);
     assert_eq!(submissions[0].execution_time, None);
 
@@ -188,8 +188,8 @@ async fn test_update_submissions() {
         .await
         .unwrap();
     assert_eq!(submissions.len(), 1);
-    assert_eq!(submissions[0].user_id, "new_user_name".to_owned());
-    assert_eq!(submissions[0].result, "AC".to_owned());
+    assert_eq!(submissions[0].user_id, "new_user_name");
+    assert_eq!(submissions[0].result, "AC");
     assert_eq!(submissions[0].point, 100.0);
     assert_eq!(submissions[0].execution_time, Some(1));
 }

atcoder-problems-backend/src/crawler/mod.rs

@@ -145,8 +145,8 @@ mod tests {
             position: "A".to_owned(),
         };
         let p = convert_problem(p);
-        assert_eq!(p.id, "id".to_owned());
-        assert_eq!(p.contest_id, "contest_id".to_owned());
-        assert_eq!(p.title, "A. title".to_owned());
+        assert_eq!(p.id, "id");
+        assert_eq!(p.contest_id, "contest_id");
+        assert_eq!(p.title, "A. title");
     }
 }

atcoder-problems-backend/src/server/user_submissions.rs

@@ -71,7 +71,7 @@ pub(crate) async fn get_user_submission_count(
     {
         let range = from_second..to_second;
         let count = pool
-            .get_user_submission_count(&user_id, range)
+            .get_user_submission_count(user_id, range)
             .await
             .map_err(error::ErrorInternalServerError)?;
 

atcoder-problems-backend/tests/test_server_e2e_submissions.rs

@@ -54,15 +54,15 @@ async fn test_user_submissions() {
     let submissions: Vec<Submission> = test::call_and_read_body_json(&app, request).await;
 
     assert_eq!(submissions.len(), 5);
-    assert!(submissions.iter().all(|s| s.user_id.as_str() == "u1"));
+    assert!(submissions.iter().all(|s| s.user_id == "u1"));
 
     let response = test::TestRequest::get()
         .uri("/atcoder-api/results?user=u2")
         .to_request();
     let submissions: Vec<Submission> = test::call_and_read_body_json(&app, response).await;
 
     assert_eq!(submissions.len(), 5);
-    assert!(submissions.iter().all(|s| s.user_id.as_str() == "u2"));
+    assert!(submissions.iter().all(|s| s.user_id == "u2"));
 }
 
 #[actix_web::test]
@@ -83,15 +83,15 @@ async fn test_user_submissions_fromtime() {
     let submissions: Vec<Submission> = test::call_and_read_body_json(&app, request).await;
 
     assert_eq!(submissions.len(), 2);
-    assert!(submissions.iter().all(|s| s.user_id.as_str() == "u1"));
+    assert!(submissions.iter().all(|s| s.user_id == "u1"));
 
     let request = test::TestRequest::get()
         .uri("/atcoder-api/v3/user/submissions?user=u2&from_second=6")
         .to_request();
     let submissions: Vec<Submission> = test::call_and_read_body_json(&app, request).await;
 
     assert_eq!(submissions.len(), 3);
-    assert!(submissions.iter().all(|s| s.user_id.as_str() == "u2"));
+    assert!(submissions.iter().all(|s| s.user_id == "u2"));
     assert_eq!(submissions[0].epoch_second, 6);
     assert_eq!(submissions[1].epoch_second, 7);
     assert_eq!(submissions[2].epoch_second, 200);