From 279983c64c7bf1420a9e50d61b3c021eef3b9ac0 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 5 Apr 2025 09:20:41 +0200 Subject: [PATCH] chore: remove all compiler and clippy warnings --- gpodder_sqlite/src/models/device.rs | 2 -- gpodder_sqlite/src/models/device_subscription.rs | 2 -- gpodder_sqlite/src/models/episode_action.rs | 3 --- src/server/gpodder/advanced/auth.rs | 4 ++-- src/server/gpodder/advanced/devices.rs | 5 ++++- src/server/gpodder/advanced/subscriptions.rs | 5 ++++- src/server/gpodder/advanced/sync.rs | 5 ++++- src/server/gpodder/format.rs | 2 +- src/server/gpodder/simple/subscriptions.rs | 5 ++++- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/gpodder_sqlite/src/models/device.rs b/gpodder_sqlite/src/models/device.rs index 1c72f89..24c15eb 100644 --- a/gpodder_sqlite/src/models/device.rs +++ b/gpodder_sqlite/src/models/device.rs @@ -17,10 +17,8 @@ use crate::schema::*; pub struct Device { pub id: i64, pub device_id: String, - pub user_id: i64, pub caption: String, pub type_: DeviceType, - pub sync_group_id: Option, } #[derive(Insertable)] diff --git a/gpodder_sqlite/src/models/device_subscription.rs b/gpodder_sqlite/src/models/device_subscription.rs index a77d2a3..39c7c42 100644 --- a/gpodder_sqlite/src/models/device_subscription.rs +++ b/gpodder_sqlite/src/models/device_subscription.rs @@ -6,8 +6,6 @@ use crate::schema::*; #[diesel(table_name = device_subscriptions)] #[diesel(check_for_backend(diesel::sqlite::Sqlite))] pub struct DeviceSubscription { - pub id: i64, - pub device_id: i64, pub podcast_url: String, pub time_changed: i64, pub deleted: bool, diff --git a/gpodder_sqlite/src/models/episode_action.rs b/gpodder_sqlite/src/models/episode_action.rs index faef14f..687db92 100644 --- a/gpodder_sqlite/src/models/episode_action.rs +++ b/gpodder_sqlite/src/models/episode_action.rs @@ -16,9 +16,6 @@ use crate::schema::*; #[diesel(table_name = episode_actions)] #[diesel(check_for_backend(diesel::sqlite::Sqlite))] pub struct EpisodeAction { - pub id: i64, - pub user_id: i64, - pub device_id: Option, pub podcast_url: String, pub episode_url: String, pub time_changed: i64, diff --git a/src/server/gpodder/advanced/auth.rs b/src/server/gpodder/advanced/auth.rs index 8dc2288..b7d98dd 100644 --- a/src/server/gpodder/advanced/auth.rs +++ b/src/server/gpodder/advanced/auth.rs @@ -20,7 +20,7 @@ use crate::server::{ pub fn router() -> Router { Router::new() .route("/{username}/login.json", post(post_login)) - .route("/{username}/logout.json", post(post_logout)) + .route("/{_username}/logout.json", post(post_logout)) } async fn post_login( @@ -85,7 +85,7 @@ async fn post_login( async fn post_logout( State(ctx): State, - Path(username): Path, + Path(_username): Path, jar: CookieJar, ) -> AppResult { if let Some(session_id) = jar.get(SESSION_ID_COOKIE) { diff --git a/src/server/gpodder/advanced/devices.rs b/src/server/gpodder/advanced/devices.rs index 9a23e38..ed85bf2 100644 --- a/src/server/gpodder/advanced/devices.rs +++ b/src/server/gpodder/advanced/devices.rs @@ -19,7 +19,10 @@ pub fn router(ctx: Context) -> Router { Router::new() .route("/{username}", get(get_devices)) .route("/{username}/{id}", post(post_device)) - .layer(middleware::from_fn_with_state(ctx.clone(), auth_api_middleware)) + .layer(middleware::from_fn_with_state( + ctx.clone(), + auth_api_middleware, + )) } async fn get_devices( diff --git a/src/server/gpodder/advanced/subscriptions.rs b/src/server/gpodder/advanced/subscriptions.rs index ad5d552..0395874 100644 --- a/src/server/gpodder/advanced/subscriptions.rs +++ b/src/server/gpodder/advanced/subscriptions.rs @@ -22,7 +22,10 @@ pub fn router(ctx: Context) -> Router { "/{username}/{id}", post(post_subscription_changes).get(get_subscription_changes), ) - .layer(middleware::from_fn_with_state(ctx.clone(), auth_api_middleware)) + .layer(middleware::from_fn_with_state( + ctx.clone(), + auth_api_middleware, + )) } pub async fn post_subscription_changes( diff --git a/src/server/gpodder/advanced/sync.rs b/src/server/gpodder/advanced/sync.rs index d8ea4e1..63f8c7c 100644 --- a/src/server/gpodder/advanced/sync.rs +++ b/src/server/gpodder/advanced/sync.rs @@ -21,7 +21,10 @@ pub fn router(ctx: Context) -> Router { "/{username}", get(get_sync_status).post(post_sync_status_changes), ) - .layer(middleware::from_fn_with_state(ctx.clone(), auth_api_middleware)) + .layer(middleware::from_fn_with_state( + ctx.clone(), + auth_api_middleware, + )) } pub async fn get_sync_status( diff --git a/src/server/gpodder/format.rs b/src/server/gpodder/format.rs index 286c61f..8839219 100644 --- a/src/server/gpodder/format.rs +++ b/src/server/gpodder/format.rs @@ -34,7 +34,7 @@ impl<'de> Deserialize<'de> for StringWithFormat { { struct StrVisitor; - impl<'de> Visitor<'de> for StrVisitor { + impl Visitor<'_> for StrVisitor { type Value = StringWithFormat; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/server/gpodder/simple/subscriptions.rs b/src/server/gpodder/simple/subscriptions.rs index 016fb37..027e575 100644 --- a/src/server/gpodder/simple/subscriptions.rs +++ b/src/server/gpodder/simple/subscriptions.rs @@ -18,7 +18,10 @@ pub fn router(ctx: Context) -> Router { get(get_device_subscriptions).put(put_device_subscriptions), ) .route("/{username}", get(get_user_subscriptions)) - .layer(middleware::from_fn_with_state(ctx.clone(), auth_api_middleware)) + .layer(middleware::from_fn_with_state( + ctx.clone(), + auth_api_middleware, + )) } pub async fn get_device_subscriptions(