Clippy lints (#330)

* Clippy lints

* Updating lint workflows

* More lint updates

Author: augustuswm

.github/workflows/build.yml

@@ -4,7 +4,6 @@ permissions:
 
 on:
   push:
-  pull_request:
 
 jobs:
   build:

.github/workflows/fmt.yml

@@ -4,7 +4,6 @@ permissions:
 
 on:
   push:
-  pull_request:
 
 jobs:
   license:

.github/workflows/license-check.yml

@@ -0,0 +1,22 @@
+name: Fmt
+permissions:
+  contents: read
+
+on:
+  push:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: cargo fmt --all -- --check
+        run: cargo fmt --all -- --check
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: cargo clippy -- -Dwarnings
+        run: cargo clippy -- -Dwarnings

.github/workflows/lint.yml

@@ -4,7 +4,6 @@ permissions:
 
 on:
   push:
-  pull_request:
 
 jobs:
   test:

.github/workflows/test.yml

@@ -50,9 +50,8 @@ impl SharedExtractor for BasicAuth {
                 header
                     .to_str()
                     .map(|s| s.to_string())
-                    .map_err(|err| {
-                        tracing::info!("Failed to turn Authorization header into string");
-                        err
+                    .inspect_err(|err| {
+                        tracing::info!(?err, "Failed to turn Authorization header into string");
                     })
                     .ok()
             });
@@ -64,18 +63,17 @@ impl SharedExtractor for BasicAuth {
             match parts {
                 Some(("Basic", token)) => BASE64_STANDARD
                     .decode(token)
-                    .map_err(|err| {
-                        tracing::info!("Failed to decode basic auth header");
-                        err
+                    .inspect_err(|err| {
+                        tracing::info!(?err, "Failed to decode basic auth header");
                     })
                     .ok()
                     .and_then(|decoded| {
                         String::from_utf8(decoded)
-                            .map_err(|err| {
+                            .inspect_err(|err| {
                                 tracing::info!(
+                                    ?err,
                                     "Failed to interpret decoded bytes from authorization header"
                                 );
-                                err
                             })
                             .ok()
                     })

dropshot-authorization-header/src/basic.rs

@@ -17,7 +17,7 @@ impl BearerAuth {
     }
 
     pub fn key(&self) -> Option<&str> {
-        self.0.as_ref().map(|s| s.as_str())
+        self.0.as_deref()
     }
 
     pub fn consume(self) -> Option<String> {
@@ -43,9 +43,8 @@ impl SharedExtractor for BearerAuth {
                 header
                     .to_str()
                     .map(|s| s.to_string())
-                    .map_err(|err| {
-                        tracing::info!("Failed to turn Authorization header into string");
-                        err
+                    .inspect_err(|err| {
+                        tracing::info!(?err, "Failed to turn Authorization header into string");
                     })
                     .ok()
             });

dropshot-authorization-header/src/bearer.rs

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "stable"
+components = ["clippy", "rustfmt"]

rust-toolchain.toml

@@ -17,7 +17,7 @@ pub fn migrations() -> Vec<Box<dyn Migration<Pg>>> {
 }
 
 pub fn run_migrations(url: &str) {
-    let mut conn = db_conn(&url);
+    let mut conn = db_conn(url);
     run_migrations_on_conn(&mut conn);
 }
 

v-api-installer/src/lib.rs

@@ -168,8 +168,8 @@ impl Parse for ContractSettings {
 
         let kind = settings
             .iter()
+            .find(|&s| s.name == "kind")
             .cloned()
-            .find(|s| s.name == "kind")
             .ok_or_else(|| Error::new(span, "Expand must contain a \"kind\" setting"))?;
 
         Ok(ContractSettings {
@@ -201,8 +201,8 @@ impl Parse for ExpandSettings {
 
         let kind = settings
             .iter()
+            .find(|&s| s.name == "kind")
             .cloned()
-            .find(|s| s.name == "kind")
             .ok_or_else(|| Error::new(span, "Expand must contain a \"kind\" setting"))?;
 
         Ok(ExpandSettings {
@@ -214,8 +214,8 @@ impl Parse for ExpandSettings {
             },
             variant: settings
                 .iter()
+                .find(|&s| s.name == "variant")
                 .cloned()
-                .find(|s| s.name == "variant")
                 .expect("Expand must contain a \"variant\" setting")
                 .value,
             source: settings.iter().find(|s| s.name == "source").map(|s| {
@@ -253,13 +253,13 @@ impl Parse for ScopeSettings {
         Ok(ScopeSettings {
             from: settings
                 .iter()
+                .find(|&v| v.name == "from")
                 .cloned()
-                .find(|v| v.name == "from")
                 .map(|v| v.value),
             to: settings
                 .iter()
+                .find(|&v| v.name == "to")
                 .cloned()
-                .find(|v| v.name == "to")
                 .map(|v| v.value),
         })
     }
@@ -313,12 +313,10 @@ pub fn v_api(attr: TokenStream, input: TokenStream) -> TokenStream {
                 #as_scope_out
                 #permission_storage_out
             }
-            .into()
         }
         _ => quote_spanned! {
                 input_span => compile_error!("v_api may only be applied to enums");
-        }
-        .into(),
+        },
     };
 
     let from = from_system_permission_tokens(&attr.source, &input.ident);
@@ -734,7 +732,7 @@ fn as_scope_trait_tokens(
 ) -> proc_macro2::TokenStream {
     let as_scope_mapping = scope_settings.iter().filter_map(|(variant, settings)| {
         settings.to.as_ref().map(|to| {
-            let fields = if variant.fields.len() > 0 {
+            let fields = if !variant.fields.is_empty() {
                 let mut fields = quote! {};
                 variant
                     .fields
@@ -802,7 +800,6 @@ fn as_scope_trait_tokens(
             }
         }
     }
-    .into()
 }
 
 fn permission_storage_trait_tokens(
@@ -844,7 +841,7 @@ fn permission_storage_contract_tokens(
                 .then(|| set_name.clone()),
         );
 
-        let fields = if variant.fields.len() > 0 && setting.kind != ContractKind::Drop {
+        let fields = if !variant.fields.is_empty() && setting.kind != ContractKind::Drop {
             let mut fields = quote! {};
             variant
                 .fields