From 479d8f1a6a35adcbb87692947757d51048c2942c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Tue, 29 Aug 2023 21:34:01 +0200
Subject: [PATCH] clippy

---
 rust/src/auth.rs                  |  2 +-
 rust/src/sqlite.rs                | 12 ++++++------
 rust/src/telemetry/metrics.rs     |  2 +-
 rust/src/telemetry/tracing/mod.rs |  5 ++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/rust/src/auth.rs b/rust/src/auth.rs
index f2aef9d..89012af 100644
--- a/rust/src/auth.rs
+++ b/rust/src/auth.rs
@@ -42,7 +42,7 @@ pub async fn authorize<B>(
                         message: e.to_string(),
                     })),
                     Ok(username) => {
-                        match models::user::User::find_by_name(&state.database_pool, &username)
+                        match models::user::User::find_by_name(&state.database_pool, username)
                             .await?
                         {
                             Some(user) => Ok(Ok(user)),
diff --git a/rust/src/sqlite.rs b/rust/src/sqlite.rs
index 6fc3566..eedf836 100644
--- a/rust/src/sqlite.rs
+++ b/rust/src/sqlite.rs
@@ -144,7 +144,7 @@ macro_rules! query_all {
         {
             use tracing::Instrument as _;
             async {
-                crate::sqlite::sqlx_query($class, $query, &[]);
+                $crate::sqlite::sqlx_query($class, $query, &[]);
                 let result: Result<Vec<$struct_into>, Error> = sqlx::query_as!(
                     $struct_row,
                     $query,
@@ -170,7 +170,7 @@ macro_rules! query_one {
         {
             use tracing::Instrument as _;
             async {
-                crate::sqlite::sqlx_query($class, $query, &[]);
+                $crate::sqlite::sqlx_query($class, $query, &[]);
                 let result: Result<Option<$struct_into>, Error> = sqlx::query_as!(
                     $struct_row,
                     $query,
@@ -194,7 +194,7 @@ macro_rules! query_exists {
         {
             use tracing::Instrument as _;
             async {
-                crate::sqlite::sqlx_query($class, $query, &[]);
+                $crate::sqlite::sqlx_query($class, $query, &[]);
                 let result: bool = sqlx::query!(
                     $query,
                     $( $args )*
@@ -216,7 +216,7 @@ macro_rules! execute {
         {
             use tracing::Instrument as _;
             async {
-                crate::sqlite::sqlx_query($class, $query, &[]);
+                $crate::sqlite::sqlx_query($class, $query, &[]);
                 let result: Result<sqlx::sqlite::SqliteQueryResult, Error> = sqlx::query!(
                     $query,
                     $( $args )*
@@ -237,7 +237,7 @@ macro_rules! execute_returning {
         {
             use tracing::Instrument as _;
             async {
-                crate::sqlite::sqlx_query($class, $query, &[]);
+                $crate::sqlite::sqlx_query($class, $query, &[]);
                 let result: Result<$t, Error> = sqlx::query!(
                     $query,
                     $( $args )*
@@ -261,7 +261,7 @@ macro_rules! execute_returning_uuid {
         {
             use tracing::Instrument as _;
             async {
-                crate::sqlite::sqlx_query($class, $query, &[]);
+                $crate::sqlite::sqlx_query($class, $query, &[]);
                 let result: Result<Uuid, Error> = sqlx::query!(
                     $query,
                     $( $args )*
diff --git a/rust/src/telemetry/metrics.rs b/rust/src/telemetry/metrics.rs
index dd643cc..e665e12 100644
--- a/rust/src/telemetry/metrics.rs
+++ b/rust/src/telemetry/metrics.rs
@@ -19,7 +19,7 @@ pub fn prometheus_server(
 ) -> (Router, impl Future<Output = Result<(), Error>>) {
     let (prometheus_layer, metric_handle) = PrometheusMetricLayerBuilder::new()
         .with_prefix(env!("CARGO_PKG_NAME"))
-        .with_metrics_from_fn(|| Handle::make_default_handle())
+        .with_metrics_from_fn(Handle::make_default_handle)
         .build_pair();
 
     let app = Router::new().route("/metrics", get(|| async move { metric_handle.render() }));
diff --git a/rust/src/telemetry/tracing/mod.rs b/rust/src/telemetry/tracing/mod.rs
index 5c70188..5008556 100644
--- a/rust/src/telemetry/tracing/mod.rs
+++ b/rust/src/telemetry/tracing/mod.rs
@@ -80,7 +80,7 @@ fn get_jaeger_layer<
     config: OpenTelemetryConfig,
     shutdown_functions: &mut Vec<Box<dyn FnOnce() -> Result<(), Box<dyn std::error::Error>>>>,
 ) -> Option<impl tracing_subscriber::Layer<T>> {
-    let opentelemetry_layer = match config {
+    match config {
         OpenTelemetryConfig::Enabled => {
             global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
             // Sets up the machinery needed to export data to Jaeger
@@ -116,8 +116,7 @@ fn get_jaeger_layer<
             Some(opentelemetry_layer)
         }
         OpenTelemetryConfig::Disabled => None,
-    };
-    opentelemetry_layer
+    }
 }
 
 pub async fn init<Func, T>(