build: Update edition to Rust 2024

Signed-off-by: Daiki Ueno <[email protected]>

Author: ueno

.github/workflows/python.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/rust.yml

@@ -22,7 +22,7 @@ jobs:
     name: Fedora tests
     runs-on: ubuntu-latest
     container:
-      image: registry.fedoraproject.org/fedora:40
+      image: registry.fedoraproject.org/fedora:42
       options: --privileged
     steps:
     - uses: actions/checkout@v4

Cargo.toml

@@ -11,7 +11,7 @@ resolver = "2"
 
 [workspace.package]
 version = "0.2.3"
-edition = "2021"
+edition = "2024"
 license = "GPL-3.0-or-later"
 authors = ["The crypto-auditing developers"]
 

agent/build.rs

@@ -37,7 +37,7 @@ fn main() {
     SkeletonBuilder::new()
         .source(&src)
         .clang_args([OsStr::new("-I"), builddir.as_os_str()])
-        .build_and_generate(&builddir.join("audit.skel.rs"))
+        .build_and_generate(builddir.join("audit.skel.rs"))
         .unwrap();
     println!("cargo:rerun-if-changed={}", src.display());
 }

agent/src/config.rs

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (C) 2022-2023 The crypto-auditing developers.
 
-use anyhow::{anyhow, Context as _, Result};
-use clap::{arg, command, parser::ValueSource, value_parser, ArgAction, ArgMatches, ValueEnum};
+use anyhow::{Context as _, Result, anyhow};
+use clap::{ArgAction, ArgMatches, ValueEnum, arg, command, parser::ValueSource, value_parser};
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;

agent/src/log_writer.rs

@@ -2,20 +2,20 @@
 // Copyright (C) 2022-2023 The crypto-auditing developers.
 
 use crate::config;
-use anyhow::{bail, Context as _, Result};
+use anyhow::{Context as _, Result, bail};
 use crypto_auditing::types::EventGroup;
 use probe::probe;
-use serde_cbor::{ser::IoWrite, Serializer};
+use serde_cbor::{Serializer, ser::IoWrite};
 use std::path::PathBuf;
-use time::{macros::format_description, OffsetDateTime};
+use time::{OffsetDateTime, macros::format_description};
 use tokio::time::{Duration, Instant};
 #[cfg(not(feature = "tokio-uring"))]
 use tokio::{
-    fs::{rename, File},
+    fs::{File, rename},
     io::AsyncWriteExt,
 };
 #[cfg(feature = "tokio-uring")]
-use tokio_uring::fs::{rename, File};
+use tokio_uring::fs::{File, rename};
 
 pub struct LogWriter {
     config: config::Config,
@@ -125,7 +125,7 @@ impl LogWriter {
         let mut counter = 0u64;
         while backup_log_file.exists() {
             counter += 1;
-            backup_log_file.set_extension(&counter.to_string());
+            backup_log_file.set_extension(counter.to_string());
         }
 
         rename(&self.config.log_file, &backup_log_file)

agent/src/main.rs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (C) 2022-2023 The crypto-auditing developers.
 
-use anyhow::{bail, Context as _, Result};
+use anyhow::{Context as _, Result, bail};
 use bytes::BytesMut;
 use core::future::Future;
 use crypto_auditing::types::{ContextID, EventGroup};
@@ -14,9 +14,9 @@ use std::io::prelude::*;
 use std::mem::MaybeUninit;
 use std::path::Path;
 use tokio::io::AsyncReadExt;
-use tokio::time::{timeout, Duration};
+use tokio::time::{Duration, timeout};
 use tracing::{debug, info};
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 
 mod config;
 mod log_writer;
@@ -180,12 +180,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
             // Successfully waited
             if let Ok(res) = res {
-                if let Some(ref mut tracer) = tracer {
-                    if let Err(e) =
+                if let Some(ref mut tracer) = tracer
+                    && let Err(e) =
                         tracer.write(&writer.elapsed(), &encryption_key, buffer.as_ref())
-                    {
-                        info!(error = %e, "error writing trace");
-                    }
+                {
+                    info!(error = %e, "error writing trace");
                 }
 
                 let n = res?;

agent/src/permissions.rs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2021 Keylime Authors
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use std::ffi::CString;
 use std::io::Error;
 

agent/src/ringbuf.rs

@@ -3,7 +3,7 @@
 // Licensed under LGPL-2.1 or BSD-2-Clause.
 
 use core::task::{Context, Poll};
-use libbpf_rs::{query::MapInfoIter, Map, MapCore};
+use libbpf_rs::{Map, MapCore, query::MapInfoIter};
 use std::io::Result;
 use std::num::NonZeroUsize;
 use std::os::fd::{AsFd, AsRawFd, RawFd};
@@ -69,7 +69,7 @@ impl RingBuffer {
         len <<= 2;
         len >>= 2;
         len += BPF_RINGBUF_HDR_SZ;
-        (len + 7) / 8 * 8
+        len.div_ceil(8) * 8
     }
 }
 

agent/tests/agenttest/build.rs

@@ -37,7 +37,7 @@ fn main() {
     SkeletonBuilder::new()
         .source(&src)
         .clang_args([OsStr::new("-I"), builddir.as_os_str()])
-        .build_and_generate(&builddir.join("agent.skel.rs"))
+        .build_and_generate(builddir.join("agent.skel.rs"))
         .unwrap();
     println!("cargo:rerun-if-changed={}", src.display());
 }