Merge pull request #1170 from hotate29/tweak

Tweak

Author: kenkoooo

atcoder-problems-backend/Cargo.lock

@@ -7,11 +7,13 @@ publish = false
 
 [dependencies]
 reqwest = { version = "0.11", features = ["json", "gzip"] }
-scraper = "0.12"
+scraper = { version = "0.12", default-features = false }
 chrono = "0.4"
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.16", features = ["macros", "rt"] }
 anyhow = "1.0"
 log = "0.4"
+
+[dev-dependencies]
+tokio = { version = "1.16", default-features = false, features = ["macros"] }

atcoder-problems-backend/atcoder-client/Cargo.toml

@@ -89,51 +89,51 @@ impl AtCoderClient {
 mod tests {
     use super::*;
 
-    #[test]
-    fn test_fetch_contest_list() {
+    #[tokio::test]
+    async fn test_fetch_contest_list() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let contests = rt
-            .block_on(client.fetch_atcoder_contests(ContestTypeSpecifier::Normal { page: 1 }))
+        let contests = client
+            .fetch_atcoder_contests(ContestTypeSpecifier::Normal { page: 1 })
+            .await
             .unwrap();
         assert_eq!(contests.len(), 50);
     }
 
-    #[test]
-    fn test_fetch_hidden_contest() {
+    #[tokio::test]
+    async fn test_fetch_hidden_contest() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let contests = rt
-            .block_on(client.fetch_atcoder_contests(ContestTypeSpecifier::Hidden))
+        let contests = client
+            .fetch_atcoder_contests(ContestTypeSpecifier::Hidden)
+            .await
             .unwrap();
         assert!(!contests.is_empty());
     }
 
-    #[test]
-    fn test_fetch_problem_list() {
+    #[tokio::test]
+    async fn test_fetch_problem_list() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let problems = rt.block_on(client.fetch_problem_list("abc107")).unwrap();
+        let problems = client.fetch_problem_list("abc107").await.unwrap();
         assert_eq!(problems.len(), 4);
     }
 
-    #[test]
-    fn test_fetch_submission_list() {
+    #[tokio::test]
+    async fn test_fetch_submission_list() {
         let client = AtCoderClient::default();
-        let rt = tokio::runtime::Runtime::new().unwrap();
-        let response = rt
-            .block_on(client.fetch_atcoder_submission_list("xmascon17", None))
+        let response = client
+            .fetch_atcoder_submission_list("xmascon17", None)
+            .await
             .unwrap();
         assert_eq!(response.submissions.len(), 20);
 
-        let response = rt
-            .block_on(client.fetch_atcoder_submission_list("xmascon17", Some(response.max_page)))
+        let response = client
+            .fetch_atcoder_submission_list("xmascon17", Some(response.max_page))
+            .await
             .unwrap();
         assert!(!response.submissions.is_empty());
 
-        let response = rt.block_on(
-            client.fetch_atcoder_submission_list("xmascon17", Some(response.max_page + 1)),
-        );
+        let response = client
+            .fetch_atcoder_submission_list("xmascon17", Some(response.max_page + 1))
+            .await;
         assert!(response.is_err());
     }
 }

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

@@ -126,26 +126,20 @@ pub(super) fn scrape_permanent(html: &str) -> Result<Vec<AtCoderContest>> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs::File;
-    use std::io::Read;
 
     #[test]
     fn test_scrape_normal() {
-        let mut file = File::open("test_resources/contests_normal").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
+        let contents = include_str!("../../test_resources/contests_normal");
 
-        let contests = scrape_normal(&contents).unwrap();
+        let contests = scrape_normal(contents).unwrap();
         assert_eq!(contests.len(), 50);
     }
 
     #[test]
     fn test_scrape_permanent() {
-        let mut file = File::open("test_resources/contests_permanent").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
+        let contents = include_str!("../../test_resources/contests_permanent");
 
-        let contests = scrape_permanent(&contents).unwrap();
+        let contests = scrape_permanent(contents).unwrap();
         assert_eq!(contests.len(), 4);
     }
 }

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

@@ -50,15 +50,11 @@ pub(super) fn scrape(html: &str, contest_id: &str) -> Result<Vec<AtCoderProblem>
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs::File;
-    use std::io::prelude::*;
 
     #[test]
     fn test_scrape() {
-        let mut file = File::open("test_resources/abc107_tasks").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        let problems = scrape(&contents, "abc107").unwrap();
+        let contents = include_str!("../../test_resources/abc107_tasks");
+        let problems = scrape(contents, "abc107").unwrap();
         assert_eq!(
             problems,
             vec![
@@ -92,10 +88,8 @@ mod tests {
 
     #[test]
     fn test_scrape_atc002() {
-        let mut file = File::open("test_resources/atc002_tasks").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        let problems = scrape(&contents, "atc002").unwrap();
+        let contents = include_str!("../../test_resources/atc002_tasks");
+        let problems = scrape(contents, "atc002").unwrap();
         assert_eq!(
             problems,
             vec![

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

@@ -143,19 +143,15 @@ pub(super) fn scrape(html_text: &str, contest_id: &str) -> Result<Vec<AtCoderSub
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::fs::File;
-    use std::io::prelude::*;
 
     #[test]
     fn test_scrape() {
-        let mut file = File::open("test_resources/abc107_submissions").unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        let submissions = scrape(&contents, "abc107").unwrap();
+        let contents = include_str!("../../test_resources/abc107_submissions");
+        let submissions = scrape(contents, "abc107").unwrap();
         assert_eq!(submissions.len(), 20);
         assert!(submissions.iter().all(|s| s.user_id.is_ascii()));
 
-        let max_page = scrape_submission_page_count(&contents).unwrap();
+        let max_page = scrape_submission_page_count(contents).unwrap();
         assert_eq!(max_page, 2208);
     }
 }

atcoder-problems-backend/atcoder-client/src/atcoder/submission.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/atcoder-client/src/atcoder/types.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/src/internal/problem_list_manager.rs

@@ -56,7 +56,7 @@ impl RatedPointSumClient for PgPool {
         let (rated_contest_ids, rated_problem_ids) =
             tokio::try_join!(rated_contest_ids_fut, rated_problem_ids_fut)?;
 
-        let rated_contest_ids = rated_contest_ids.into_iter().collect::<BTreeSet<_>>();
+        let rated_contest_ids = BTreeSet::from_iter(rated_contest_ids);
         let rated_problem_ids = rated_problem_ids
             .into_iter()
             .filter(|p| rated_contest_ids.contains(&p.contest_id))
@@ -86,7 +86,7 @@ impl RatedPointSumClient for PgPool {
             })
             .into_iter()
             .map(|(user_id, set)| {
-                let sum = set.into_iter().map(|(_, point)| point).sum::<i64>();
+                let sum = set.into_values().sum::<i64>();
                 (user_id, sum)
             })
             .collect::<Vec<_>>();

atcoder-problems-backend/sql-client/src/rated_point_sum.rs

@@ -105,7 +105,7 @@ impl StreakClient for PgPool {
         let user_max_streak = first_ac_map
             .into_iter()
             .map(|(user_id, m)| {
-                let max_streak = get_max_streak(m.into_iter().map(|(_, utc)| utc).collect());
+                let max_streak = get_max_streak(m.into_values().collect());
                 (user_id, max_streak)
             })
             .collect::<Vec<_>>();