Bump version to 0.3.0-beta13

This also cleans up some clippy lints

Author: erickt

.github/workflows/rust.yml

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

clippy.toml

@@ -17,7 +17,7 @@ futures-executor = "0.3.1"
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
-tuf = { version = "0.3.0-beta12", path = "../tuf" }
+tuf = { path = "../tuf" }
 walkdir = "2.3.2"
 
 [dev-dependencies]

interop-tests/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "tuf"
 edition = "2021"
-version = "0.3.0-beta12"
+version = "0.3.0-beta13"
+rust-version = "1.71.1"
 authors = [ "heartsucker <[email protected]>", "Erick Tryzelaar <[email protected]>" ]
 description = "Library for The Update Framework (TUF)"
 homepage = "https://github.com/theupdateframework/rust-tuf"

tuf/Cargo.toml

@@ -1269,16 +1269,11 @@ mod test {
     }
 
     fn check_public_key_hash(key1: &PublicKey, key2: &PublicKey) {
-        use std::hash::{BuildHasher, Hash, Hasher};
+        use std::hash::BuildHasher;
 
         let state = std::collections::hash_map::RandomState::new();
-        let mut hasher1 = state.build_hasher();
-        key1.hash(&mut hasher1);
 
-        let mut hasher2 = state.build_hasher();
-        key2.hash(&mut hasher2);
-
-        assert_ne!(hasher1.finish(), hasher2.finish());
+        assert_ne!(state.hash_one(key1), state.hash_one(key2));
     }
 
     #[test]

tuf/src/crypto.rs

@@ -11,9 +11,9 @@
 //! actually implement TUF for a community repository.
 //!
 //! - [The Diplomat paper
-//! (2016)](https://www.usenix.org/conference/nsdi16/technical-sessions/presentation/kuppusamy)
+//!   (2016)](https://www.usenix.org/conference/nsdi16/technical-sessions/presentation/kuppusamy)
 //! - [The Mercury paper
-//! (2017)](https://www.usenix.org/conference/atc17/technical-sessions/presentation/kuppusamy)
+//!   (2017)](https://www.usenix.org/conference/atc17/technical-sessions/presentation/kuppusamy)
 //!
 //! Failure to read the spec and the above papers will likely lead to an implementation that does
 //! not take advantage of all the security guarantees that TUF offers.
@@ -81,11 +81,11 @@
 //! 2. `rarely-updated-projects`
 //!   - Terminating
 //!   - Signs all packages for all projects that have been "abandoned" or left unupdated for a long
-//!   time AND have not yet registered keys with TUF
+//!     time AND have not yet registered keys with TUF
 //! 3. `new-projects`
 //!   - Non-terminating
 //!   - Signs all packages for all new projects as well as projects that were relegated to
-//!   `rarely-updated-projects`
+//!     `rarely-updated-projects`
 //!
 //! The top-level `targets` role as well as `claimed-projects` and `rarely-updated-projects`
 //! **MUST** all use offline keys.

tuf/src/lib.rs

@@ -483,10 +483,10 @@ where
     /// hash of the returned bytes will match a hash included in, for example, a snapshot metadata
     /// file, as:
     /// * Parsing metadata removes unknown fields, which would not be included in the returned
-    /// bytes,
+    ///   bytes,
     /// * [Pouf] implementations only guarantee the bytes are canonical for the purpose of a
-    /// signature. Metadata obtained from a remote source may have included different whitespace
-    /// or ordered fields in a way that is not preserved when parsing that metadata.
+    ///   signature. Metadata obtained from a remote source may have included different whitespace
+    ///   or ordered fields in a way that is not preserved when parsing that metadata.
     pub fn to_raw(&self) -> Result<RawSignedMetadata<D, M>> {
         let bytes = D::canonicalize(&D::serialize(self)?)?;
         Ok(RawSignedMetadata::new(bytes))

tuf/src/metadata.rs

@@ -227,7 +227,7 @@ where
     _pouf: PhantomData<D>,
 }
 
-impl<'a, D, R> RepoContext<'a, D, R>
+impl<D, R> RepoContext<'_, D, R>
 where
     D: Pouf,
     R: RepositoryStorage<D>,
@@ -293,11 +293,7 @@ where
 
     /// The initial version number for non-root metadata.
     fn non_root_initial_version(&self) -> u32 {
-        if let Some(time_version) = self.time_version {
-            time_version
-        } else {
-            1
-        }
+        self.time_version.unwrap_or(1)
     }
 
     /// If time versioning is enabled, this updates the current time version to match the current
@@ -1410,7 +1406,7 @@ where
     }
 }
 
-impl<'a, D, R> RepoBuilder<'a, D, R, Done<D>>
+impl<D, R> RepoBuilder<'_, D, R, Done<D>>
 where
     D: Pouf,
     R: RepositoryStorage<D>,

tuf/src/repo_builder.rs

@@ -334,7 +334,7 @@ pub enum CommitError {
     },
 }
 
-impl<'a, D> FileSystemBatchUpdate<'a, D>
+impl<D> FileSystemBatchUpdate<'_, D>
 where
     D: Pouf,
 {