Skip to content

Commit e33159e

Browse files
committed
BTreeMap::into_values()を使うように
1 parent c2b13a7 commit e33159e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl RatedPointSumClient for PgPool {
5656
let (rated_contest_ids, rated_problem_ids) =
5757
tokio::try_join!(rated_contest_ids_fut, rated_problem_ids_fut)?;
5858

59-
let rated_contest_ids = rated_contest_ids.into_iter().collect::<BTreeSet<_>>();
59+
let rated_contest_ids = BTreeSet::from_iter(rated_contest_ids);
6060
let rated_problem_ids = rated_problem_ids
6161
.into_iter()
6262
.filter(|p| rated_contest_ids.contains(&p.contest_id))
@@ -86,7 +86,7 @@ impl RatedPointSumClient for PgPool {
8686
})
8787
.into_iter()
8888
.map(|(user_id, set)| {
89-
let sum = set.into_iter().map(|(_, point)| point).sum::<i64>();
89+
let sum = set.into_values().sum::<i64>();
9090
(user_id, sum)
9191
})
9292
.collect::<Vec<_>>();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl StreakClient for PgPool {
105105
let user_max_streak = first_ac_map
106106
.into_iter()
107107
.map(|(user_id, m)| {
108-
let max_streak = get_max_streak(m.into_iter().map(|(_, utc)| utc).collect());
108+
let max_streak = get_max_streak(m.into_values().collect());
109109
(user_id, max_streak)
110110
})
111111
.collect::<Vec<_>>();

atcoder-problems-backend/src/bin/dump_json.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ async fn main() -> Result<()> {
8383
}
8484

8585
let mut language_count = reduced_language_count
86-
.into_iter()
87-
.flat_map(|(_, v)| v.into_iter())
86+
.into_values()
87+
.flatten()
8888
.map(|(_, e)| e)
8989
.collect::<Vec<_>>();
9090
language_count.sort_by(|a, b| {

0 commit comments

Comments
 (0)