Fix clippy errors (?)

Author: penelopeysm

rust/Makefile

@@ -1,2 +1,2 @@
 types:
-	cargo test && rm -r ../src/lib/bindings && mv bindings ../src/lib
+	cargo run --bin export-types

rust/src/core.rs

@@ -1,24 +1,21 @@
-use chrono::{DateTime, Utc, TimeZone};
+use chrono::{DateTime, Utc};
 use chrono_tz::Europe::London;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 #[derive(Debug, Serialize, Deserialize, TS)]
-#[ts(export)]
 pub struct Piece {
     pub composer: String,
     pub title: String,
 }
 
 #[derive(Debug, Serialize, Deserialize, TS)]
-#[ts(export)]
 pub struct Performer {
     pub name: String,
     pub instrument: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, TS)]
-#[ts(export)]
 pub struct Concert {
     pub datetime: DateTime<Utc>,
     pub url: String,
@@ -36,7 +33,7 @@ pub struct Concert {
     pub is_prom: bool,
 }
 
-pub fn report_concert(c: &Concert) -> () {
+pub fn report_concert(c: &Concert) {
     let london_datetime = c.datetime.with_timezone(&London);
     eprintln!("Found concert on {}: {}", london_datetime, c.title);
 }

rust/src/proms.rs

@@ -36,7 +36,7 @@ pub async fn scrape(url: &str, client: &reqwest::Client) -> Vec<core::Concert> {
             .for_each(|concert| concerts.push(concert));
     }
 
-    return concerts;
+    concerts
 }
 
 /// Intermediate struct which contains information about a single concert entry. This does not
@@ -107,8 +107,7 @@ fn parse_single_concert(elem: ElementRef<'_>) -> PromsConcertMetadata {
         Selector::parse("li.ev-act-schedule__performance-composer-segments").unwrap();
     let pieces: Vec<core::Piece> = elem
         .select(&pieces_selector)
-        .map(|piece_elem| parse_piece(piece_elem))
-        .filter_map(|x| x)
+        .filter_map(parse_piece)
         .collect();
 
     let performer_selector = Selector::parse(

rust/src/wigmore.rs

@@ -13,10 +13,10 @@ pub async fn get_concerts(client: &reqwest::Client) -> Vec<core::Concert> {
     println!("Scraping Wigmore Hall concerts");
     println!("----------------------------------------");
 
-    let wigmore_intermediate_concerts = get_api(&client).await;
+    let wigmore_intermediate_concerts = get_api(client).await;
 
     let mut wigmore_concerts = stream::iter(&wigmore_intermediate_concerts[..40])
-        .map(|concert| get_full_concert(&concert, &client))
+        .map(|concert| get_full_concert(concert, client))
         .buffer_unordered(10)
         .collect::<Vec<Option<core::Concert>>>()
         .await
@@ -50,7 +50,7 @@ async fn get_api_page(
         page_number
     );
     let json: serde_json::Value = client.get(url).send().await.unwrap().json().await.unwrap();
-    let concerts = parse_api(&json["items"].as_array().unwrap());
+    let concerts = parse_api(json["items"].as_array().unwrap());
     (concerts, json["totalPages"].as_u64().unwrap())
 }
 
@@ -94,8 +94,7 @@ async fn get_api(client: &reqwest::Client) -> Vec<WigmoreFrontPageConcert> {
     let remaining_concerts: Vec<WigmoreFrontPageConcert> = join_all(futures)
         .await
         .into_iter()
-        .map(|(concerts, _)| concerts)
-        .flatten()
+        .flat_map(|(concerts, _)| concerts)
         .collect();
     concerts.extend(remaining_concerts);
     concerts
@@ -158,9 +157,8 @@ fn parse_concert_json(
                     .and_then(|arr| arr[0]["title"].as_str())
                     .or(Some(""))
                     .map(|s| decode_html_entities(s).to_string());
-                match (opt_title, opt_composer) {
-                    (Some(title), Some(composer)) => pieces.push(core::Piece { title, composer }),
-                    _ => (),
+                if let (Some(title), Some(composer)) = (opt_title, opt_composer) {
+                    pieces.push(core::Piece { title, composer });
                 }
             }
         }
@@ -182,12 +180,11 @@ fn parse_concert_json(
             for credit in credits {
                 let opt_artist_name = credit["artist"]["title"].as_str().map(decode_html_entities);
                 let opt_role = credit["role"].as_str().map(decode_html_entities);
-                match (opt_artist_name, opt_role) {
-                    (Some(artist_name), Some(role)) => performers.push(core::Performer {
+                if let (Some(artist_name), Some(role)) = (opt_artist_name, opt_role) {
+                    performers.push(core::Performer {
                         name: artist_name.to_string(),
                         instrument: Some(role.to_string()),
-                    }),
-                    _ => (),
+                    });
                 }
             }
         }