From 70525c018dfd31a27805bb1fb666501b73d43e21 Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Thu, 20 Feb 2025 21:37:33 -0500 Subject: Upgrade to Rust 1.85 and Rust 2024 edition. There are a couple of migration suggestions from `cargo fix --edition` that I have deliberately skipped, which are intended to make sure that the changes to `if let` scoping don't bite us. They don't, I'm pretty sure, and if I turn out to be wrong, I'd rather fix the scoping issues (as they arise) than use `match` (`cargo fix --edition`'s suggestion). This change also includes a bulk reformat and a clippy cleanup. NOTA BENE: As this requires a new Rust toolchain, you'll need to update Rust (`rustup update`, normally) or the server won't build. This also applies to the Debian builder Docker image; it'll need to be rebuilt (from scratch, pulling its base image again) as well. --- src/event/extract.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/event/extract.rs') diff --git a/src/event/extract.rs b/src/event/extract.rs index 4a35937..8fde1d5 100644 --- a/src/event/extract.rs +++ b/src/event/extract.rs @@ -2,10 +2,10 @@ use std::ops::Deref; use axum::{ extract::{FromRequestParts, OptionalFromRequestParts}, - http::{request::Parts, HeaderName, HeaderValue}, + http::{HeaderName, HeaderValue, request::Parts}, }; use axum_extra::typed_header::TypedHeader; -use serde::{de::DeserializeOwned, Serialize}; +use serde::{Serialize, de::DeserializeOwned}; // A typed header. When used as a bare extractor, reads from the // `Last-Event-Id` HTTP header. -- cgit v1.2.3