From 68b2b1beb4ac5a15050c5adafb9dbb285436e035 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 17 Jun 2025 09:53:50 +0200 Subject: [PATCH] chore: format code --- otter/src/cli/mod.rs | 2 +- otter/src/server/gpodder/advanced/auth.rs | 8 ++++---- otter/src/server/gpodder/advanced/devices.rs | 4 ++-- otter/src/server/gpodder/advanced/episodes.rs | 4 ++-- otter/src/server/gpodder/advanced/subscriptions.rs | 4 ++-- otter/src/server/gpodder/advanced/sync.rs | 4 ++-- otter/src/server/gpodder/format.rs | 2 +- otter/src/server/gpodder/mod.rs | 8 ++++---- otter/src/server/gpodder/simple/subscriptions.rs | 4 ++-- otter/src/server/mod.rs | 2 +- otter/src/server/static/mod.rs | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/otter/src/cli/mod.rs b/otter/src/cli/mod.rs index 8493451..6dc1dab 100644 --- a/otter/src/cli/mod.rs +++ b/otter/src/cli/mod.rs @@ -6,8 +6,8 @@ use std::path::PathBuf; use clap::{Args, Parser, Subcommand, ValueEnum}; use figment::{ - providers::{Env, Format, Serialized, Toml}, Figment, + providers::{Env, Format, Serialized, Toml}, }; use serde::Serialize; diff --git a/otter/src/server/gpodder/advanced/auth.rs b/otter/src/server/gpodder/advanced/auth.rs index b7d98dd..9c920dc 100644 --- a/otter/src/server/gpodder/advanced/auth.rs +++ b/otter/src/server/gpodder/advanced/auth.rs @@ -1,20 +1,20 @@ use axum::{ + Router, extract::{Path, State}, routing::post, - Router, }; use axum_extra::{ - extract::{cookie::Cookie, CookieJar}, - headers::{authorization::Basic, Authorization, UserAgent}, TypedHeader, + extract::{CookieJar, cookie::Cookie}, + headers::{Authorization, UserAgent, authorization::Basic}, }; use cookie::time::Duration; use gpodder::AuthErr; use crate::server::{ + Context, error::{AppError, AppResult}, gpodder::SESSION_ID_COOKIE, - Context, }; pub fn router() -> Router { diff --git a/otter/src/server/gpodder/advanced/devices.rs b/otter/src/server/gpodder/advanced/devices.rs index ed85bf2..30bec37 100644 --- a/otter/src/server/gpodder/advanced/devices.rs +++ b/otter/src/server/gpodder/advanced/devices.rs @@ -1,18 +1,18 @@ use axum::{ + Extension, Json, Router, extract::{Path, State}, middleware, routing::{get, post}, - Extension, Json, Router, }; use crate::server::{ + Context, error::{AppError, AppResult}, gpodder::{ auth_api_middleware, format::{Format, StringWithFormat}, models, }, - Context, }; pub fn router(ctx: Context) -> Router { diff --git a/otter/src/server/gpodder/advanced/episodes.rs b/otter/src/server/gpodder/advanced/episodes.rs index 3f61477..2d62333 100644 --- a/otter/src/server/gpodder/advanced/episodes.rs +++ b/otter/src/server/gpodder/advanced/episodes.rs @@ -1,13 +1,14 @@ use axum::{ + Extension, Json, Router, extract::{Path, Query, State}, middleware, routing::post, - Extension, Json, Router, }; use chrono::DateTime; use serde::{Deserialize, Serialize}; use crate::server::{ + Context, error::{AppError, AppResult}, gpodder::{ auth_api_middleware, @@ -15,7 +16,6 @@ use crate::server::{ models, models::UpdatedUrlsResponse, }, - Context, }; pub fn router(ctx: Context) -> Router { diff --git a/otter/src/server/gpodder/advanced/subscriptions.rs b/otter/src/server/gpodder/advanced/subscriptions.rs index 0395874..b430b3e 100644 --- a/otter/src/server/gpodder/advanced/subscriptions.rs +++ b/otter/src/server/gpodder/advanced/subscriptions.rs @@ -1,19 +1,19 @@ use axum::{ + Extension, Json, Router, extract::{Path, Query, State}, middleware, routing::post, - Extension, Json, Router, }; use serde::Deserialize; use crate::server::{ + Context, error::{AppError, AppResult}, gpodder::{ auth_api_middleware, format::{Format, StringWithFormat}, models::{SubscriptionDelta, SubscriptionDeltaResponse, UpdatedUrlsResponse}, }, - Context, }; pub fn router(ctx: Context) -> Router { diff --git a/otter/src/server/gpodder/advanced/sync.rs b/otter/src/server/gpodder/advanced/sync.rs index 63f8c7c..1ac2c33 100644 --- a/otter/src/server/gpodder/advanced/sync.rs +++ b/otter/src/server/gpodder/advanced/sync.rs @@ -1,18 +1,18 @@ use axum::{ + Extension, Json, Router, extract::{Path, State}, middleware, routing::get, - Extension, Json, Router, }; use crate::server::{ + Context, error::{AppError, AppResult}, gpodder::{ auth_api_middleware, format::{Format, StringWithFormat}, models::{SyncStatus, SyncStatusDelta}, }, - Context, }; pub fn router(ctx: Context) -> Router { diff --git a/otter/src/server/gpodder/format.rs b/otter/src/server/gpodder/format.rs index 8839219..d2ff395 100644 --- a/otter/src/server/gpodder/format.rs +++ b/otter/src/server/gpodder/format.rs @@ -1,8 +1,8 @@ use std::ops::Deref; use serde::{ - de::{value::StrDeserializer, Visitor}, Deserialize, + de::{Visitor, value::StrDeserializer}, }; #[derive(Deserialize, Debug, PartialEq, Eq)] diff --git a/otter/src/server/gpodder/mod.rs b/otter/src/server/gpodder/mod.rs index 1bf8061..e8f77e3 100644 --- a/otter/src/server/gpodder/mod.rs +++ b/otter/src/server/gpodder/mod.rs @@ -4,16 +4,16 @@ mod models; mod simple; use axum::{ + RequestExt, Router, extract::{Request, State}, - http::{header::WWW_AUTHENTICATE, HeaderName, HeaderValue, StatusCode}, + http::{HeaderName, HeaderValue, StatusCode, header::WWW_AUTHENTICATE}, middleware::Next, response::{IntoResponse, Response}, - RequestExt, Router, }; use axum_extra::{ - extract::{cookie::Cookie, CookieJar}, - headers::{authorization::Basic, Authorization}, TypedHeader, + extract::{CookieJar, cookie::Cookie}, + headers::{Authorization, authorization::Basic}, }; use tower_http::set_header::SetResponseHeaderLayer; diff --git a/otter/src/server/gpodder/simple/subscriptions.rs b/otter/src/server/gpodder/simple/subscriptions.rs index 027e575..cd960f1 100644 --- a/otter/src/server/gpodder/simple/subscriptions.rs +++ b/otter/src/server/gpodder/simple/subscriptions.rs @@ -1,14 +1,14 @@ use axum::{ + Extension, Json, Router, extract::{Path, State}, middleware, routing::get, - Extension, Json, Router, }; use crate::server::{ + Context, error::{AppError, AppResult}, gpodder::{auth_api_middleware, format::StringWithFormat}, - Context, }; pub fn router(ctx: Context) -> Router { diff --git a/otter/src/server/mod.rs b/otter/src/server/mod.rs index 7ceb245..20886c6 100644 --- a/otter/src/server/mod.rs +++ b/otter/src/server/mod.rs @@ -6,12 +6,12 @@ mod web; use std::sync::Arc; use axum::{ + Router, body::Body, extract::Request, http::StatusCode, middleware::Next, response::{IntoResponse, Response}, - Router, }; use http_body_util::BodyExt; use tower_http::trace::TraceLayer; diff --git a/otter/src/server/static/mod.rs b/otter/src/server/static/mod.rs index 568061c..a97f5de 100644 --- a/otter/src/server/static/mod.rs +++ b/otter/src/server/static/mod.rs @@ -1,7 +1,7 @@ use std::io::Cursor; -use axum::{routing::get, Router}; -use axum_extra::{headers::Range, TypedHeader}; +use axum::{Router, routing::get}; +use axum_extra::{TypedHeader, headers::Range}; use axum_range::{KnownSize, Ranged}; use super::Context;