Auto merge of #3374 - jtgeibel:clippy/nightly, r=Turbo87

bors · bors · commit 6f7600d858ac · 2021-03-08T08:36:35.000Z
Address new clippy findings

r? `@Turbo87`
diff --git a/src/middleware/log_request.rs b/src/middleware/log_request.rs
@@ -105,8 +105,8 @@ fn report_to_sentry(req: &dyn RequestExt, res: &AfterResult, response_time: u64)
                 .collect();
 
             let sentry_req = sentry::protocol::Request {
-                method,
                 url,
+                method,
                 headers,
                 ..Default::default()
             };
diff --git a/src/models/token.rs b/src/models/token.rs
@@ -29,7 +29,7 @@ pub struct ApiToken {
 impl ApiToken {
     /// Generates a new named API token for a user
     pub fn insert(conn: &PgConnection, user_id: i32, name: &str) -> AppResult<CreatedApiToken> {
-        let token = SecureToken::generate(SecureTokenKind::API);
+        let token = SecureToken::generate(SecureTokenKind::Api);
 
         let model: ApiToken = diesel::insert_into(api_tokens::table)
             .values((
@@ -49,7 +49,7 @@ impl ApiToken {
         use crate::schema::api_tokens::dsl::*;
         use diesel::{dsl::now, update};
 
-        let token_ = SecureToken::parse(SecureTokenKind::API, token_)
+        let token_ = SecureToken::parse(SecureTokenKind::Api, token_)
             .ok_or_else(InsecurelyGeneratedTokenRevoked::boxed)?;
 
         let tokens = api_tokens
diff --git a/src/tests/builders/version.rs b/src/tests/builders/version.rs
@@ -81,10 +81,7 @@ impl<'a> VersionBuilder<'a> {
     ) -> AppResult<Version> {
         use diesel::{insert_into, update};
 
-        let license = match self.license {
-            Some(license) => Some(license.to_owned()),
-            None => None,
-        };
+        let license = self.license.map(|license| license.to_owned());
 
         let mut vers = NewVersion::new(
             crate_id,
diff --git a/src/tests/record.rs b/src/tests/record.rs
@@ -283,7 +283,7 @@ async fn record_http(req: Request<Body>, client: Client) -> Result<ResponseAndEx
         .unwrap();
     *hyper_response.headers_mut() = headers;
 
-    Ok((hyper_response, Exchange { response, request }))
+    Ok((hyper_response, Exchange { request, response }))
 }
 
 fn replay_http(
diff --git a/src/util/token.rs b/src/util/token.rs
@@ -93,7 +93,7 @@ secure_token_kind! {
     /// tokens of that kind, distrupting production users.
     #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
     pub(crate) enum SecureTokenKind {
-        API => "cio", // Crates.IO
+        Api => "cio", // Crates.IO
     }
 }
 
@@ -113,7 +113,7 @@ mod tests {
 
     #[test]
     fn test_generated_and_parse() {
-        const KIND: SecureTokenKind = SecureTokenKind::API;
+        const KIND: SecureTokenKind = SecureTokenKind::Api;
 
         let token = SecureToken::generate(KIND);
         assert!(token.plaintext().starts_with(KIND.prefix()));
@@ -129,7 +129,7 @@ mod tests {
 
     #[test]
     fn test_parse_no_kind() {
-        assert!(SecureToken::parse(SecureTokenKind::API, "nokind").is_none());
+        assert!(SecureToken::parse(SecureTokenKind::Api, "nokind").is_none());
     }
 
     #[test]
@@ -143,7 +143,7 @@ mod tests {
             remaining.remove(&kind);
         };
 
-        ensure(SecureTokenKind::API, "cio");
+        ensure(SecureTokenKind::Api, "cio");
 
         assert!(
             remaining.is_empty(),

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ async fn record_http(req: Request<Body>, client: Client) -> Result<ResponseAndEx`
`283`	`283`	`.unwrap();`
`284`	`284`	`*hyper_response.headers_mut() = headers;`
`285`	`285`
`286`		`- Ok((hyper_response, Exchange { response, request }))`
	`286`	`+ Ok((hyper_response, Exchange { request, response }))`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`fn replay_http(`