Update to edition 2024

Most of this was done with rustfix.

Author: erickt

.github/workflows/rust.yml

@@ -18,7 +18,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.71.1"
+          - "1.85.0"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1

interop-tests/Cargo.toml

@@ -5,7 +5,7 @@ authors = [ "heartsucker <heartsucker@autistici.org>", "Erick Tryzelaar <etryzel
 description = "TUF library interoperation tests"
 homepage = "https://github.com/theupdateframework/rust-tuf"
 repository = "https://github.com/theupdateframework/rust-tuf"
-edition = "2021"
+edition = "2024"
 readme = "README.md"
 license = "MIT/Apache-2.0"
 publish = false

interop-tests/src/lib.rs

@@ -76,11 +76,10 @@ fn copy_repo(dir: &Path, step: u8) {
 
     for (path, f) in read_dir_files(&src) {
         let path = dst.join(path);
-        if let Some(parent) = path.parent() {
-            if !parent.exists() {
+        if let Some(parent) = path.parent()
+            && !parent.exists() {
                 fs::create_dir_all(parent).unwrap();
             }
-        }
         fs::write(path, &f).unwrap();
     }
 }

interop-tests/src/pretty.rs

@@ -2,8 +2,8 @@ use {
     serde::de::DeserializeOwned,
     serde::ser::Serialize,
     tuf::{
-        pouf::{Pouf, Pouf1},
         Result,
+        pouf::{Pouf, Pouf1},
     },
 };
 

rustfmt.toml

@@ -1 +1 @@
-edition = "2018"
+edition = "2024"

tuf/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "tuf"
-edition = "2021"
+edition = "2024"
 version = "0.3.0-beta14"
-rust-version = "1.80.0"
+rust-version = "1.85.0"
 authors = [ "heartsucker <heartsucker@autistici.org>", "Erick Tryzelaar <etryzelaar@google.com>" ]
 description = "Library for The Update Framework (TUF)"
 homepage = "https://github.com/theupdateframework/rust-tuf"

tuf/src/client.rs

@@ -47,7 +47,7 @@
 //! # }
 //! ```
 
-use chrono::{offset::Utc, DateTime};
+use chrono::{DateTime, offset::Utc};
 use futures_io::AsyncRead;
 use log::{error, warn};
 use std::future::Future;
@@ -845,7 +845,7 @@ where
     pub async fn fetch_target(
         &mut self,
         target: &TargetPath,
-    ) -> Result<impl AsyncRead + Send + Unpin + '_> {
+    ) -> Result<impl AsyncRead + Send + Unpin + '_ + use<'_, D, L, R>> {
         self.fetch_target_with_start_time(target, &Utc::now()).await
     }
 
@@ -858,7 +858,7 @@ where
         &mut self,
         target: &TargetPath,
         start_time: &DateTime<Utc>,
-    ) -> Result<impl AsyncRead + Send + Unpin + '_> {
+    ) -> Result<impl AsyncRead + Send + Unpin + '_ + use<'_, D, L, R>> {
         let target_description = self
             .fetch_target_description_with_start_time(target, start_time)
             .await?;
@@ -1304,7 +1304,7 @@ mod test {
     use crate::pouf::Pouf1;
     use crate::repo_builder::RepoBuilder;
     use crate::repository::{
-        fetch_metadata_to_string, EphemeralRepository, ErrorRepository, Track, TrackRepository,
+        EphemeralRepository, ErrorRepository, Track, TrackRepository, fetch_metadata_to_string,
     };
     use assert_matches::assert_matches;
     use chrono::prelude::*;

tuf/src/crypto.rs

@@ -7,11 +7,11 @@ use {
     ring::{
         digest::{self, SHA256, SHA512},
         rand::SystemRandom,
-        signature::{Ed25519KeyPair, KeyPair, ED25519},
+        signature::{ED25519, Ed25519KeyPair, KeyPair},
     },
     serde::{
-        de::Error as DeserializeError, ser::Error as SerializeError, Deserialize, Deserializer,
-        Serialize, Serializer,
+        Deserialize, Deserializer, Serialize, Serializer, de::Error as DeserializeError,
+        ser::Error as SerializeError,
     },
     std::{
         cmp::Ordering,
@@ -682,7 +682,7 @@ impl Ord for PublicKey {
 
 impl PartialOrd for PublicKey {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.key_id.cmp(&other.key_id))
+        Some(self.cmp(other))
     }
 }
 
@@ -829,7 +829,7 @@ impl HashAlgorithm {
         match self {
             HashAlgorithm::Sha256 => Ok(digest::Context::new(&SHA256)),
             HashAlgorithm::Sha512 => Ok(digest::Context::new(&SHA512)),
-            HashAlgorithm::Unknown(ref s) => Err(Error::IllegalArgument(format!(
+            HashAlgorithm::Unknown(s) => Err(Error::IllegalArgument(format!(
                 "Unknown hash algorithm: {}",
                 s
             ))),

tuf/src/database.rs

@@ -1,10 +1,11 @@
 //! Components needed to verify TUF metadata and targets.
 
-use chrono::{offset::Utc, DateTime};
+use chrono::{DateTime, offset::Utc};
 use std::cmp::Ordering;
 use std::collections::{HashMap, HashSet};
 use std::marker::PhantomData;
 
+use crate::Result;
 use crate::crypto::PublicKey;
 use crate::error::Error;
 use crate::metadata::{
@@ -14,7 +15,6 @@ use crate::metadata::{
 };
 use crate::pouf::Pouf;
 use crate::verify::{self, Verified};
-use crate::Result;
 
 /// Contains trusted TUF metadata and can be used to verify other metadata and targets.
 #[derive(Debug)]

tuf/src/error.rs

@@ -5,7 +5,7 @@ use {
         crypto::KeyId,
         metadata::{MetadataPath, MetadataVersion, TargetPath},
     },
-    chrono::{offset::Utc, DateTime},
+    chrono::{DateTime, offset::Utc},
     std::io,
     thiserror::Error,
 };
@@ -183,7 +183,9 @@ pub enum Error {
 
     /// The parent metadata expected the child metadata to be at one version, but was found to be at
     /// another version.
-    #[error("metadata {parent_role} expected metadata {child_role} version {expected_version}, but found {new_version}")]
+    #[error(
+        "metadata {parent_role} expected metadata {child_role} version {expected_version}, but found {new_version}"
+    )]
     WrongMetadataVersion {
         /// The parent metadata that contains the child metadata's version.
         parent_role: MetadataPath,