Run clippy linting on tests too (#420)

bitwarden · Dec 11, 2023 · e270190 · e270190
1 parent 18036ea
commit e270190
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 38 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -49,6 +49,6 @@ jobs:
           RUSTDOCFLAGS: "-D warnings"
 
       - name: Cargo clippy
-        run: cargo clippy --all-features
+        run: cargo clippy --all-features --tests
         env:
           RUSTFLAGS: "-D warnings"
diff --git a/crates/bitwarden/src/auth/api/response/identity_payload_response.rs b/crates/bitwarden/src/auth/api/response/identity_payload_response.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[cfg_attr(test, derive(Default))]
 pub struct IdentityTokenPayloadResponse {
     pub access_token: String,
     pub expires_in: u64,
@@ -10,21 +11,3 @@ pub struct IdentityTokenPayloadResponse {
 
     pub(crate) encrypted_payload: String,
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    impl Default for IdentityTokenPayloadResponse {
-        fn default() -> Self {
-            Self {
-                access_token: Default::default(),
-                expires_in: Default::default(),
-                refresh_token: Default::default(),
-                token_type: Default::default(),
-                scope: Default::default(),
-                encrypted_payload: Default::default(),
-            }
-        }
-    }
-}
diff --git a/crates/bitwarden/src/auth/api/response/identity_refresh_response.rs b/crates/bitwarden/src/auth/api/response/identity_refresh_response.rs
@@ -1,27 +1,11 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[cfg_attr(test, derive(Default))]
 pub struct IdentityTokenRefreshResponse {
     pub access_token: String,
     pub expires_in: u64,
     pub refresh_token: Option<String>,
     token_type: String,
     scope: String,
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    impl Default for IdentityTokenRefreshResponse {
-        fn default() -> Self {
-            Self {
-                access_token: Default::default(),
-                expires_in: Default::default(),
-                refresh_token: Default::default(),
-                token_type: Default::default(),
-                scope: Default::default(),
-            }
-        }
-    }
-}
diff --git a/crates/bitwarden/src/auth/api/response/identity_token_response.rs b/crates/bitwarden/src/auth/api/response/identity_token_response.rs
@@ -57,7 +57,7 @@ mod test {
 
     #[test]
     fn two_factor() {
-        let expected = Box::new(IdentityTwoFactorResponse::default());
+        let expected = Box::<IdentityTwoFactorResponse>::default();
         let two_factor = serde_json::to_string(&expected).unwrap();
         let expected = IdentityTokenResponse::TwoFactorRequired(expected);
         let actual = parse_identity_response(StatusCode::BAD_REQUEST, two_factor).unwrap();

diff --git a/crates/bitwarden/src/vault/send.rs b/crates/bitwarden/src/vault/send.rs
@@ -280,7 +280,7 @@ mod tests {
                     iterations: 345123.try_into().unwrap(),
                 },
             },
-            "asdfasdfasdf".into(),
+            "asdfasdfasdf",
             "2.majkL1/hNz9yptLqNAUSnw==|RiOzMTTJMG948qu8O3Zm1EQUO2E8BuTwFKnO9LWQjMzxMWJM5GbyOq2/A+tumPbTERt4JWur/FKfgHb+gXuYiEYlXPMuVBvT7nv4LPytJuM=|IVqMxHJeR1ZXY0sGngTC0x+WqbG8p6V+BTrdgBbQXjM=".parse().unwrap(),
             "2.kmLY8NJVuiKBFJtNd/ZFpA==|qOodlRXER+9ogCe3yOibRHmUcSNvjSKhdDuztLlucs10jLiNoVVVAc+9KfNErLSpx5wmUF1hBOJM8zwVPjgQTrmnNf/wuDpwiaCxNYb/0v4FygPy7ccAHK94xP1lfqq7U9+tv+/yiZSwgcT+xF0wFpoxQeNdNRFzPTuD9o4134n8bzacD9DV/WjcrXfRjbBCzzuUGj1e78+A7BWN7/5IWLz87KWk8G7O/W4+8PtEzlwkru6Wd1xO19GYU18oArCWCNoegSmcGn7w7NDEXlwD403oY8Oa7ylnbqGE28PVJx+HLPNIdSC6YKXeIOMnVs7Mctd/wXC93zGxAWD6ooTCzHSPVV50zKJmWIG2cVVUS7j35H3rGDtUHLI+ASXMEux9REZB8CdVOZMzp2wYeiOpggebJy6MKOZqPT1R3X0fqF2dHtRFPXrNsVr1Qt6bS9qTyO4ag1/BCvXF3P1uJEsI812BFAne3cYHy5bIOxuozPfipJrTb5WH35bxhElqwT3y/o/6JWOGg3HLDun31YmiZ2HScAsUAcEkA4hhoTNnqy4O2s3yVbCcR7jF7NLsbQc0MDTbnjxTdI4VnqUIn8s2c9hIJy/j80pmO9Bjxp+LQ9a2hUkfHgFhgHxZUVaeGVth8zG2kkgGdrp5VHhxMVFfvB26Ka6q6qE/UcS2lONSv+4T8niVRJz57qwctj8MNOkA3PTEfe/DP/LKMefke31YfT0xogHsLhDkx+mS8FCc01HReTjKLktk/Jh9mXwC5oKwueWWwlxI935ecn+3I2kAuOfMsgPLkoEBlwgiREC1pM7VVX1x8WmzIQVQTHd4iwnX96QewYckGRfNYWz/zwvWnjWlfcg8kRSe+68EHOGeRtC5r27fWLqRc0HNcjwpgHkI/b6czerCe8+07TWql4keJxJxhBYj3iOH7r9ZS8ck51XnOb8tGL1isimAJXodYGzakwktqHAD7MZhS+P02O+6jrg7d+yPC2ZCuS/3TOplYOCHQIhnZtR87PXTUwr83zfOwAwCyv6KP84JUQ45+DItrXLap7nOVZKQ5QxYIlbThAO6eima6Zu5XHfqGPMNWv0bLf5+vAjIa5np5DJrSwz9no/hj6CUh0iyI+SJq4RGI60lKtypMvF6MR3nHLEHOycRUQbZIyTHWl4QQLdHzuwN9lv10ouTEvNr6sFflAX2yb6w3hlCo7oBytH3rJekjb3IIOzBpeTPIejxzVlh0N9OT5MZdh4sNKYHUoWJ8mnfjdM+L4j5Q2Kgk/XiGDgEebkUxiEOQUdVpePF5uSCE+TPav/9FIRGXGiFn6NJMaU7aBsDTFBLloffFLYDpd8/bTwoSvifkj7buwLYM+h/qcnfdy5FWau1cKav+Blq/ZC0qBpo658RTC8ZtseAFDgXoQZuksM10hpP9bzD04Bx30xTGX81QbaSTNwSEEVrOtIhbDrj9OI43KH4O6zLzK+t30QxAv5zjk10RZ4+5SAdYndIlld9Y62opCfPDzRy3ubdve4ZEchpIKWTQvIxq3T5ogOhGaWBVYnkMtM2GVqvWV//46gET5SH/MdcwhACUcZ9kCpMnWH9CyyUwYvTT3UlNyV+DlS27LMPvaw7tx7qa+GfNCoCBd8S4esZpQYK/WReiS8=|pc7qpD42wxyXemdNPuwxbh8iIaryrBPu8f/DGwYdHTw=".parse().unwrap(),
         ).unwrap();