From d10710326da703f69eaa06723dc66e330fd32745 Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Wed, 1 Jan 2025 23:17:56 +0300
Subject: axum: 0.7.9 → 0.8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some breaking changes. For better or for worse. The optional extractor
breaking change is a double-edged sword, since not all extractors can
be used with `Option<T>` now, and you have to use
`Result<T, T::Rejection>` even when you want to ignore an error coming
from an extractor, such as `Query`.

However, this allows catching errors on authorization extractors even
in places where authorization is optional.

Change-Id: I35f809d3adf27dbef0e7ee93dc1a7af178b7d014
---
 src/frontend/mod.rs        | 4 ++--
 src/frontend/onboarding.rs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/frontend')

diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 9abbcf1..8338ac6 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -1,10 +1,10 @@
 use crate::database::{Storage, StorageError};
 use axum::{
-    extract::{Host, Query, State},
+    extract::{Query, State},
     http::{StatusCode, Uri},
     response::IntoResponse,
 };
-use axum_extra::headers::HeaderMapExt;
+use axum_extra::{extract::Host, headers::HeaderMapExt};
 use futures_util::FutureExt;
 use serde::Deserialize;
 use std::convert::TryInto;
diff --git a/src/frontend/onboarding.rs b/src/frontend/onboarding.rs
index a8d2ae6..4588157 100644
--- a/src/frontend/onboarding.rs
+++ b/src/frontend/onboarding.rs
@@ -2,11 +2,12 @@ use std::sync::Arc;
 
 use crate::database::{settings, Storage};
 use axum::{
-    extract::{FromRef, Host, State},
+    extract::{FromRef, State},
     http::StatusCode,
     response::{Html, IntoResponse},
     Json,
 };
+use axum_extra::extract::Host;
 use kittybox_frontend_renderer::{ErrorPage, OnboardingPage, Template};
 use serde::Deserialize;
 use tokio::{task::JoinSet, sync::Mutex};
-- 
cgit 1.4.1