hannes/packager
1
0
Fork 0
Code Issues 10 Pull Requests Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
Hannes Körber
2023-08-29 21:34:01 +02:00
parent ffb1b42f42
commit 479d8f1a6a
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/src/auth.rs
View File

@@ -42,7 +42,7 @@ pub async fn authorize<B>(
message: e.to_string(), message: e.to_string(),
})), })),
Ok(username) => { 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? .await?
{ {
Some(user) => Ok(Ok(user)), Some(user) => Ok(Ok(user)),

12
rust/src/sqlite.rs
View File

@@ -144,7 +144,7 @@ macro_rules! query_all {
{ {
use tracing::Instrument as _; use tracing::Instrument as _;
async { async {
crate::sqlite::sqlx_query($class, $query, &[]); $crate::sqlite::sqlx_query($class, $query, &[]);
let result: Result<Vec<$struct_into>, Error> = sqlx::query_as!( let result: Result<Vec<$struct_into>, Error> = sqlx::query_as!(
$struct_row, $struct_row,
$query, $query,
@@ -170,7 +170,7 @@ macro_rules! query_one {
{ {
use tracing::Instrument as _; use tracing::Instrument as _;
async { async {
crate::sqlite::sqlx_query($class, $query, &[]); $crate::sqlite::sqlx_query($class, $query, &[]);
let result: Result<Option<$struct_into>, Error> = sqlx::query_as!( let result: Result<Option<$struct_into>, Error> = sqlx::query_as!(
$struct_row, $struct_row,
$query, $query,
@@ -194,7 +194,7 @@ macro_rules! query_exists {
{ {
use tracing::Instrument as _; use tracing::Instrument as _;
async { async {
crate::sqlite::sqlx_query($class, $query, &[]); $crate::sqlite::sqlx_query($class, $query, &[]);
let result: bool = sqlx::query!( let result: bool = sqlx::query!(
$query, $query,
$( $args )* $( $args )*
@@ -216,7 +216,7 @@ macro_rules! execute {
{ {
use tracing::Instrument as _; use tracing::Instrument as _;
async { async {
crate::sqlite::sqlx_query($class, $query, &[]); $crate::sqlite::sqlx_query($class, $query, &[]);
let result: Result<sqlx::sqlite::SqliteQueryResult, Error> = sqlx::query!( let result: Result<sqlx::sqlite::SqliteQueryResult, Error> = sqlx::query!(
$query, $query,
$( $args )* $( $args )*
@@ -237,7 +237,7 @@ macro_rules! execute_returning {
{ {
use tracing::Instrument as _; use tracing::Instrument as _;
async { async {
crate::sqlite::sqlx_query($class, $query, &[]); $crate::sqlite::sqlx_query($class, $query, &[]);
let result: Result<$t, Error> = sqlx::query!( let result: Result<$t, Error> = sqlx::query!(
$query, $query,
$( $args )* $( $args )*
@@ -261,7 +261,7 @@ macro_rules! execute_returning_uuid {
{ {
use tracing::Instrument as _; use tracing::Instrument as _;
async { async {
crate::sqlite::sqlx_query($class, $query, &[]); $crate::sqlite::sqlx_query($class, $query, &[]);
let result: Result<Uuid, Error> = sqlx::query!( let result: Result<Uuid, Error> = sqlx::query!(
$query, $query,
$( $args )* $( $args )*

2
rust/src/telemetry/metrics.rs
View File

@@ -19,7 +19,7 @@ pub fn prometheus_server(
) -> (Router, impl Future<Output = Result<(), Error>>) { ) -> (Router, impl Future<Output = Result<(), Error>>) {
let (prometheus_layer, metric_handle) = PrometheusMetricLayerBuilder::new() let (prometheus_layer, metric_handle) = PrometheusMetricLayerBuilder::new()
.with_prefix(env!("CARGO_PKG_NAME")) .with_prefix(env!("CARGO_PKG_NAME"))
.with_metrics_from_fn(|| Handle::make_default_handle()) .with_metrics_from_fn(Handle::make_default_handle)
.build_pair(); .build_pair();
let app = Router::new().route("/metrics", get(|| async move { metric_handle.render() })); let app = Router::new().route("/metrics", get(|| async move { metric_handle.render() }));

5
rust/src/telemetry/tracing/mod.rs
View File

@@ -80,7 +80,7 @@ fn get_jaeger_layer<
config: OpenTelemetryConfig, config: OpenTelemetryConfig,
shutdown_functions: &mut Vec<Box<dyn FnOnce() -> Result<(), Box<dyn std::error::Error>>>>, shutdown_functions: &mut Vec<Box<dyn FnOnce() -> Result<(), Box<dyn std::error::Error>>>>,
) -> Option<impl tracing_subscriber::Layer<T>> { ) -> Option<impl tracing_subscriber::Layer<T>> {
let opentelemetry_layer = match config { match config {
OpenTelemetryConfig::Enabled => { OpenTelemetryConfig::Enabled => {
global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new()); global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
// Sets up the machinery needed to export data to Jaeger // Sets up the machinery needed to export data to Jaeger
@@ -116,8 +116,7 @@ fn get_jaeger_layer<
Some(opentelemetry_layer) Some(opentelemetry_layer)
} }
OpenTelemetryConfig::Disabled => None, OpenTelemetryConfig::Disabled => None,
}; }
opentelemetry_layer
} }
pub async fn init<Func, T>( pub async fn init<Func, T>(