Merge pull request #207 from kpcyrd/edition-2024

Update Rust edition to 2024

Author: kpcyrd

common/Cargo.toml

@@ -5,7 +5,7 @@ description = "rebuilderd - common code"
 authors = ["kpcyrd <[email protected]>"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/kpcyrd/rebuilderd"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -30,4 +30,4 @@ tokio-test = "0.4.4"
 
 [features]
 diesel = ["dep:diesel"]
-v0 = []
+v0 = []

common/src/api/mod.rs

@@ -2,7 +2,7 @@ use crate::auth;
 use crate::config::ConfigFile;
 use crate::errors::Error;
 use crate::utils::zstd_compress;
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use async_trait::async_trait;
 use log::debug;
 use reqwest::header::CONTENT_ENCODING;

common/src/api/v1/models/build.rs

@@ -1,8 +1,8 @@
 use chrono::NaiveDateTime;
 #[cfg(feature = "diesel")]
 use diesel::{
-    deserialize::FromSql, serialize::Output, serialize::ToSql, sql_types::Text, sqlite::Sqlite,
-    sqlite::SqliteValue, AsExpression, FromSqlRow, Queryable,
+    AsExpression, FromSqlRow, Queryable, deserialize::FromSql, serialize::Output, serialize::ToSql,
+    sql_types::Text, sqlite::Sqlite, sqlite::SqliteValue,
 };
 use serde::{Deserialize, Serialize};
 use std::error::Error;

common/src/config.rs

@@ -20,10 +20,10 @@ pub fn load<P: AsRef<Path>>(path: Option<P>) -> Result<ConfigFile> {
         config.update(c);
     }
 
-    if let Ok(path) = config_path() {
-        if let Some(c) = load_from(path)? {
-            config.update(c);
-        }
+    if let Ok(path) = config_path()
+        && let Some(c) = load_from(path)?
+    {
+        config.update(c);
     }
 
     if let Some(path) = path {

common/src/errors.rs

@@ -1,2 +1,2 @@
-pub use anyhow::{anyhow, bail, format_err, Context, Error, Result};
+pub use anyhow::{Context, Error, Result, anyhow, bail, format_err};
 pub use log::{debug, error, info, trace, warn};

daemon/Cargo.toml

@@ -5,7 +5,7 @@ description = "rebuilderd - independent build verification daemon"
 authors = ["kpcyrd <[email protected]>"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/kpcyrd/rebuilderd"
-edition = "2021"
+edition = "2024"
 
 [package.metadata.deb]
 maintainer-scripts = "daemon/debian"

daemon/src/api/mod.rs

@@ -1,7 +1,7 @@
 use crate::web;
 use actix_web::http::header::{AcceptEncoding, ContentEncoding, Encoding, Header};
 use actix_web::{HttpRequest, HttpResponse};
-use rebuilderd_common::errors::{format_err, Context, Error};
+use rebuilderd_common::errors::{Context, Error, format_err};
 use rebuilderd_common::utils::{is_zstd_compressed, zstd_decompress};
 
 pub mod v0;

daemon/src/api/v0/dashboard.rs

@@ -2,9 +2,9 @@ use crate::api::v0::into_queue_item;
 use crate::models::Queued;
 use crate::schema::{build_inputs, queue, rebuilds, source_packages};
 use chrono::prelude::*;
+use diesel::NullableExpressionMethods;
 use diesel::dsl::{case_when, sum};
 use diesel::sql_types::Integer;
-use diesel::NullableExpressionMethods;
 use diesel::{BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
 use rebuilderd_common::api::v0::*;
 use rebuilderd_common::errors::*;

daemon/src/api/v0/mod.rs

@@ -14,9 +14,9 @@ use crate::models;
 use crate::models::{BinaryPackage, BuildInput, Queued, SourcePackage};
 use crate::schema::*;
 use crate::web;
-use actix_web::{get, http, post, HttpRequest, HttpResponse, Responder};
-use chrono::prelude::*;
+use actix_web::{HttpRequest, HttpResponse, Responder, get, http, post};
 use chrono::Duration;
+use chrono::prelude::*;
 pub(crate) use dashboard::DashboardState;
 use diesel::dsl::auto_type;
 use diesel::{QueryDsl, RunQueryDsl};
@@ -188,10 +188,10 @@ pub async fn list_pkgs(
         .map_err(Error::from)?
     {
         let latest_built_at = DateTime::from_naive_utc_and_offset(latest_built_at, Utc);
-        if let Some(duration) = modified_since_duration(&req, latest_built_at) {
-            if duration.num_seconds() >= 0 {
-                return Ok(not_modified());
-            }
+        if let Some(duration) = modified_since_duration(&req, latest_built_at)
+            && duration.num_seconds() >= 0
+        {
+            return Ok(not_modified());
         }
 
         let latest_built_at = SystemTime::from(latest_built_at);

daemon/src/api/v1/build.rs

@@ -14,11 +14,11 @@ use crate::schema::{
     rebuilds, source_packages,
 };
 use crate::{attestation, web};
-use actix_web::{get, post, HttpRequest, HttpResponse, Responder};
+use actix_web::{HttpRequest, HttpResponse, Responder, get, post};
 use chrono::{Duration, Utc};
-use diesel::dsl::update;
 use diesel::NullableExpressionMethods;
 use diesel::QueryDsl;
+use diesel::dsl::update;
 use diesel::{ExpressionMethods, SqliteExpressionMethods};
 use diesel::{OptionalExtension, RunQueryDsl};
 use in_toto::crypto::PrivateKey;
@@ -28,8 +28,8 @@ use rebuilderd_common::api::v1::{
 };
 use rebuilderd_common::errors::Error;
 use rebuilderd_common::utils::{is_zstd_compressed, zstd_compress};
-use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::collections::hash_map::Entry;
 use std::sync::Arc;
 
 #[diesel::dsl::auto_type]