Clippy

Author: kornelski

crates/freighter-api-types/src/index/response.rs

@@ -83,9 +83,9 @@ pub struct CrateVersion {
     /// The current values are:
     ///
     /// * 1: The schema as documented here, not including newer additions.
-    ///      This is honored in Rust version 1.51 and newer.
+    ///   This is honored in Rust version 1.51 and newer.
     /// * 2: The addition of the `features2` field.
-    ///      This is honored in Rust version 1.60 and newer.
+    ///   This is honored in Rust version 1.60 and newer.
     #[cfg_attr(any(feature = "index", feature = "client"), serde(default = "default_v"))]
     pub v: u32,
     /// This optional field contains features with new, extended syntax.

crates/freighter-auth/src/base64_serde.rs

@@ -36,11 +36,11 @@ pub fn deserialize<'de, D: Deserializer<'de>, const N: usize>(deserializer: D) -
         }
 
         fn visit_str<E: Error>(self, s: &str) -> Result<Self::Value, E> {
-            decode(s).ok_or(Error::invalid_value(Unexpected::Str(s), &self))
+            decode(s).ok_or_else(|| Error::invalid_value(Unexpected::Str(s), &self))
         }
 
         fn visit_borrowed_str<E: Error>(self, s: &'de str) -> Result<Self::Value, E> {
-            decode(s).ok_or(Error::invalid_value(Unexpected::Str(s), &self))
+            decode(s).ok_or_else(|| Error::invalid_value(Unexpected::Str(s), &self))
         }
     }
 

crates/freighter-auth/src/cf_access.rs

@@ -143,6 +143,7 @@ impl CfAccess {
                 AuthError::Unauthorized
             })?
             .claims;
+        drop(locked_keys);
 
         let sub = claims.sub.filter(|s| !s.is_empty());
         let sub_was_empty = sub.is_none();

crates/freighter-auth/src/fs_backend.rs

@@ -43,7 +43,7 @@ impl FsAuthProvider {
     }
 
     #[allow(clippy::unused_self)]
-    fn random_token(&self) -> AuthResult<BareToken> {
+    fn random_token(&self) -> BareToken {
         use rand::Rng;
         let mut token = [0; 21];
         rand::rng().fill(&mut token);
@@ -150,7 +150,7 @@ impl AuthProvider for FsAuthProvider {
 
     async fn register(&self, username: &str) -> AuthResult<String> {
         let owners = &mut *self.owners_mut()?;
-        let bare_token = self.random_token()?;
+        let bare_token = self.random_token();
         let hashed_token = self.hash_token(&bare_token);
         let token_str = self.token_to_str(&bare_token);
         owners.register(username, &hashed_token)?;

crates/freighter-fs-index/src/lib.rs

@@ -123,7 +123,7 @@ impl FsIndexProvider {
                 path.push_str(&lc_crate_name[..1]);
             }
             _ => return None,
-        };
+        }
         path.push('/');
         path.push_str(lc_crate_name);
         Some(path)

crates/freighter-server/src/lib.rs

@@ -66,6 +66,7 @@ pub struct ServiceState {
 }
 
 impl ServiceState {
+    #[must_use]
     pub fn new(
         mut config: ServiceConfig,
         index: Box<dyn IndexProvider + Send + Sync + 'static>,

crates/freighter-server/tests/common/utils.rs

@@ -59,14 +59,11 @@ pub fn generate_crate_payload(
     .to_string();
 
     // https://github.com/rust-lang/cargo/blob/20df9e40a4d41dd08478549915588395e55efb4c/crates/crates-io/lib.rs#L259
-    let payload = {
-        let mut payload = Vec::new();
-        payload.extend_from_slice(&(json.len() as u32).to_le_bytes());
-        payload.extend_from_slice(json.as_bytes());
-        payload.extend_from_slice(&(tarball.len() as u32).to_le_bytes());
-        payload.extend_from_slice(tarball);
-        payload
-    };
-
+    
+    let mut payload = Vec::new();
+    payload.extend_from_slice(&(json.len() as u32).to_le_bytes());
+    payload.extend_from_slice(json.as_bytes());
+    payload.extend_from_slice(&(tarball.len() as u32).to_le_bytes());
+    payload.extend_from_slice(tarball);
     payload
 }