Skip to content

Commit 11cd795

Browse files
committed
fix clippy
1 parent 0c538a2 commit 11cd795

File tree

11 files changed

+28
-31
lines changed

11 files changed

+28
-31
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl AtCoderClient {
4040

4141
async fn fetch_atcoder_hidden_contests(&self) -> Result<Vec<AtCoderContest>> {
4242
let uri = "https://kenkoooo.com/atcoder/static_data/backend/hidden_contests.json";
43-
util::get_json(&uri).await
43+
util::get_json(uri).await
4444
}
4545

4646
/// Fetch a list of submissions.
@@ -105,7 +105,7 @@ mod tests {
105105
let client = AtCoderClient::default();
106106
let contests =
107107
block_on(client.fetch_atcoder_contests(ContestTypeSpecifier::Hidden)).unwrap();
108-
assert!(contests.len() >= 1);
108+
assert!(!contests.is_empty());
109109
}
110110

111111
#[test]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(super) fn scrape_normal(html: &str) -> Result<Vec<AtCoderContest>> {
2222
.text()
2323
.next()
2424
.ok_or_else(|| anyhow!("Failed to parse html."))?;
25-
let start = DateTime::parse_from_str(&start, "%Y-%m-%d %H:%M:%S%z")?;
25+
let start = DateTime::parse_from_str(start, "%Y-%m-%d %H:%M:%S%z")?;
2626
let start = start.timestamp() as u64;
2727

2828
let contest = tds.next().ok_or_else(|| anyhow!("Failed to parse html."))?;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use scraper::{Html, Selector};
99
pub(super) fn scrape_submission_page_count(html: &str) -> Result<u32> {
1010
let selector = Selector::parse("a").unwrap();
1111
let re = Regex::new(r"page=\d+$").unwrap();
12-
Html::parse_document(&html)
12+
Html::parse_document(html)
1313
.select(&selector)
1414
.flat_map(|el| el.value().attr("href"))
1515
.filter(|href| re.is_match(href))
@@ -26,7 +26,7 @@ pub(super) fn scrape(html_text: &str, contest_id: &str) -> Result<Vec<AtCoderSub
2626
let a_selector = Selector::parse("a").unwrap();
2727
let re = Regex::new(r"submissions/\d+$").unwrap();
2828

29-
Html::parse_document(&html_text)
29+
Html::parse_document(html_text)
3030
.select(&tbody_selector)
3131
.next()
3232
.ok_or_else(|| anyhow!("Failed to parse html."))?
@@ -40,7 +40,7 @@ pub(super) fn scrape(html_text: &str, contest_id: &str) -> Result<Vec<AtCoderSub
4040
.text()
4141
.next()
4242
.ok_or_else(|| anyhow!("Failed to parse html."))?;
43-
let time = DateTime::parse_from_str(&time, "%Y-%m-%d %H:%M:%S%z")?;
43+
let time = DateTime::parse_from_str(time, "%Y-%m-%d %H:%M:%S%z")?;
4444
let epoch_second = time.timestamp() as u64;
4545

4646
let problem_id = tds

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl LanguageCountClient for PgPool {
4848
.fold(
4949
BTreeMap::new(),
5050
|mut map, (user_id, problem_id, language)| {
51-
let simplified_language = simplify_language(&language);
51+
let simplified_language = simplify_language(language);
5252
map.entry((user_id, simplified_language))
5353
.or_insert_with(BTreeSet::new)
5454
.insert(problem_id);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ async fn test_contest_problem() {
1515
let pool = utils::initialize_and_connect_to_test_sql().await;
1616
assert!(pool.load_contest_problem().await.unwrap().is_empty());
1717

18-
pool.insert_contest_problem(&vec![create_problem(1), create_problem(2)])
18+
pool.insert_contest_problem(&[create_problem(1), create_problem(2)])
1919
.await
2020
.unwrap();
2121
assert_eq!(
2222
pool.load_contest_problem().await.unwrap(),
2323
vec![create_problem(1), create_problem(2)]
2424
);
25-
pool.insert_contest_problem(&vec![create_problem(1)])
25+
pool.insert_contest_problem(&[create_problem(1)])
2626
.await
2727
.unwrap();
2828
assert_eq!(

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ async fn test_language_count() {
133133
);
134134

135135
let language_count_1st_to_2nd = pool
136-
.load_language_count_in_range(&"language1", 0..2)
136+
.load_language_count_in_range("language1", 0..2)
137137
.await
138138
.unwrap();
139139
assert_eq!(
@@ -151,7 +151,7 @@ async fn test_language_count() {
151151
);
152152

153153
let language_count_2nd_to_2nd = pool
154-
.load_language_count_in_range(&"language1", 1..2)
154+
.load_language_count_in_range("language1", 1..2)
155155
.await
156156
.unwrap();
157157
assert_eq!(
@@ -163,14 +163,14 @@ async fn test_language_count() {
163163
);
164164

165165
assert_eq!(
166-
pool.load_language_count_in_range(&"language1", 0..10)
166+
pool.load_language_count_in_range("language1", 0..10)
167167
.await
168168
.unwrap()
169169
.len(),
170170
2
171171
);
172172

173-
let language_count = pool.load_users_language_count(&"user1").await.unwrap();
173+
let language_count = pool.load_users_language_count("user1").await.unwrap();
174174
assert_eq!(
175175
language_count,
176176
vec![
@@ -186,7 +186,7 @@ async fn test_language_count() {
186186
},
187187
]
188188
);
189-
let language_count_rank = pool.load_users_language_count_rank(&"user1").await.unwrap();
189+
let language_count_rank = pool.load_users_language_count_rank("user1").await.unwrap();
190190
assert_eq!(
191191
language_count_rank,
192192
vec![
@@ -203,7 +203,7 @@ async fn test_language_count() {
203203
]
204204
);
205205

206-
let language_count = pool.load_users_language_count(&"user2").await.unwrap();
206+
let language_count = pool.load_users_language_count("user2").await.unwrap();
207207
assert_eq!(
208208
language_count,
209209
vec![UserLanguageCount {
@@ -212,7 +212,7 @@ async fn test_language_count() {
212212
problem_count: 1,
213213
},]
214214
);
215-
let language_count_rank = pool.load_users_language_count_rank(&"user2").await.unwrap();
215+
let language_count_rank = pool.load_users_language_count_rank("user2").await.unwrap();
216216
assert_eq!(
217217
language_count_rank,
218218
vec![UserLanguageCountRank {
@@ -222,7 +222,7 @@ async fn test_language_count() {
222222
},]
223223
);
224224

225-
let language_count = pool.load_users_language_count(&"user3").await.unwrap();
225+
let language_count = pool.load_users_language_count("user3").await.unwrap();
226226
assert_eq!(
227227
language_count,
228228
vec![
@@ -238,7 +238,7 @@ async fn test_language_count() {
238238
},
239239
]
240240
);
241-
let language_count_rank = pool.load_users_language_count_rank(&"user3").await.unwrap();
241+
let language_count_rank = pool.load_users_language_count_rank("user3").await.unwrap();
242242
assert_eq!(
243243
language_count_rank,
244244
vec![

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mod utils;
77
async fn test_insert_contests() {
88
let pool = utils::initialize_and_connect_to_test_sql().await;
99
assert!(pool.load_contests().await.unwrap().is_empty());
10-
pool.insert_contests(&vec![Contest {
10+
pool.insert_contests(&[Contest {
1111
id: "contest1".to_string(),
1212
start_epoch_second: 0,
1313
duration_second: 0,
@@ -20,7 +20,7 @@ async fn test_insert_contests() {
2020
let contests = pool.load_contests().await.unwrap();
2121
assert_eq!(contests[0].id.as_str(), "contest1");
2222

23-
pool.insert_contests(&vec![Contest {
23+
pool.insert_contests(&[Contest {
2424
id: "contest1".to_string(),
2525
start_epoch_second: 0,
2626
duration_second: 0,
@@ -35,7 +35,7 @@ async fn test_insert_contests() {
3535
async fn test_insert_problems() {
3636
let pool = utils::initialize_and_connect_to_test_sql().await;
3737
assert!(pool.load_problems().await.unwrap().is_empty());
38-
pool.insert_problems(&vec![Problem {
38+
pool.insert_problems(&[Problem {
3939
id: "problem1".to_string(),
4040
contest_id: "".to_string(),
4141
title: "".to_string(),
@@ -46,7 +46,7 @@ async fn test_insert_problems() {
4646
let problems = pool.load_problems().await.unwrap();
4747
assert_eq!(problems[0].id.as_str(), "problem1");
4848

49-
pool.insert_problems(&vec![Problem {
49+
pool.insert_problems(&[Problem {
5050
id: "problem1".to_string(),
5151
contest_id: "".to_string(),
5252
title: "".to_string(),

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
2424
let recent_submissions = conn.get_submissions(request).await?;
2525

2626
info!("Filter submission by user_id ...");
27-
let recent_submissions = recent_submissions
28-
.into_iter()
29-
.filter(|submission| !EXCLUDED_USERS.contains(&submission.user_id.as_str()))
30-
.collect::<Vec<_>>();
3127

3228
let user_ids = recent_submissions
3329
.into_iter()
30+
.filter(|submission| !EXCLUDED_USERS.contains(&submission.user_id.as_str()))
3431
.map(|s| s.user_id)
3532
.collect::<BTreeSet<_>>();
3633
let user_ids = user_ids.iter().map(|s| s.as_str()).collect::<Vec<_>>();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ where
2121
{
2222
let list_id = request.param("list_id")?;
2323
let conn = request.state().pg_pool.clone();
24-
let list = conn.get_single_list(&list_id).await?;
24+
let list = conn.get_single_list(list_id).await?;
2525
let response = Response::json(&list)?;
2626
Ok(response)
2727
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl<A: Authentication + Clone + Send + Sync + 'static> RequestUnpack for Reques
1818
let client = self.state().authentication.clone();
1919
let token = self.cookie("token").with_context(|| "Cookie not found")?;
2020
let response = client
21-
.get_user_id(&token.value())
21+
.get_user_id(token.value())
2222
.await
2323
.map_err(|_| anyhow::Error::msg("GitHub connection error"))?;
2424
Ok(response.id.to_string())

0 commit comments

Comments
 (0)