feat: bump toolchain to latest stable, 1.75.0

Also fixed the warnings exposed by the newer rustc

This was motivated by an error only seen for apple targets:
tkaitchuck/aHash#195

Signed-off-by: Jim Crossley <[email protected]>

admin/src/upload.rs

@@ -122,7 +122,7 @@ async fn upload(
     headers: Vec<String>,
     id: Option<String>,
 ) -> anyhow::Result<()> {
-    let mut builder = client.post(url.clone());
+    let mut builder = client.post(url);
     if let Some(id) = id {
         builder = builder.query(&[("id", id)]);
     }

collectorist/api/src/coordinator/collectors.rs

@@ -59,7 +59,7 @@ impl Collectors {
             log::info!("check pkgs {}", collector.id);
             if collector.config.interests.contains(&Interest::Package) {
                 log::info!("dispatch pkgs {}", collector.id);
-                futures.push(collector.collect_packages(state.clone(), request.purls.clone()));
+                futures.push(collector.collect_packages(state, request.purls.clone()));
             }
         }
 

collectorist/api/src/coordinator/mod.rs

@@ -59,7 +59,7 @@ impl Coordinator {
                                     Entry::Git(_) => {}
                                     Entry::Oci(_) => {}
                                     Entry::Purl(purl) => {
-                                        self.add_purl(state.clone(), purl.as_str()).await.ok();
+                                        self.add_purl(state, purl.as_str()).await.ok();
                                     }
                                     Entry::GithubRelease(_) => {}
                                 }
@@ -85,7 +85,7 @@ impl Coordinator {
         state: &AppState,
         request: CollectPackagesRequest,
     ) -> Vec<CollectPackagesResponse> {
-        state.collectors.collect_packages(state.clone(), request).await
+        state.collectors.collect_packages(state, request).await
     }
 
     pub async fn add_purl(&self, state: &AppState, purl: &str) -> Result<(), anyhow::Error> {

collectorist/api/src/db/mod.rs

@@ -33,8 +33,8 @@ impl Db {
             r#"insert or ignore into purls (purl) values ($1)
             "#,
         )
-        .bind(purl.clone())
-        .bind(purl.clone())
+        .bind(purl)
+        .bind(purl)
         .execute(&self.pool)
         .await?;
 
@@ -46,7 +46,7 @@ impl Db {
             r#"insert or ignore into vulnerabilities (id) values ($1)
             "#,
         )
-        .bind(vuln_id.clone())
+        .bind(vuln_id)
         .execute(&self.pool)
         .await?;
 
@@ -77,7 +77,7 @@ impl Db {
         as_of: DateTime<Utc>,
     ) -> Result<(), anyhow::Error> {
         sqlx::query(r#"replace into collector_purls (collector, purl, timestamp) VALUES ($1, $2, $3)"#)
-            .bind(collector_id.clone())
+            .bind(collector_id)
             .bind(purl)
             .bind(as_of)
             .execute(&self.pool)
@@ -101,7 +101,7 @@ impl Db {
             where
                 collector = $1 and purl = $2"#,
         )
-        .bind(collector_id.clone())
+        .bind(collector_id)
         .bind(purl.clone())
         .fetch_optional(&self.pool)
         .await?

index/src/s3dir.rs

@@ -6,7 +6,6 @@ use std::{
     sync::Arc,
 };
 
-pub use s3::{creds::Credentials, Region};
 use s3::{error::S3Error, Bucket};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread;

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.71.0"
+channel = "1.75.0"
 components = [ "rustfmt" ]