Update Rust to edition 2024

geneit_backend/src/controllers/accommodations_list_controller.rs

@@ -4,7 +4,7 @@ use crate::extractors::accommodation_extractor::FamilyAndAccommodationInPath;
 use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
 use crate::models::Accommodation;
 use crate::services::accommodations_list_service;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 
 #[derive(thiserror::Error, Debug)]
 enum AccommodationListControllerErr {

geneit_backend/src/controllers/accommodations_reservations_calendars_controller.rs

@@ -1,6 +1,6 @@
 use ical::{generator::*, *};
 
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 use chrono::DateTime;
 
 use crate::constants::StaticConstraints;

geneit_backend/src/controllers/accommodations_reservations_controller.rs

@@ -5,7 +5,7 @@ use crate::extractors::family_extractor::FamilyInPath;
 use crate::models::{Accommodation, AccommodationReservationID, NewAccommodationReservation};
 use crate::services::accommodations_reservations_service;
 use crate::utils::time_utils::time;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 
 #[derive(serde::Deserialize)]
 pub struct UpdateReservationQuery {

geneit_backend/src/controllers/auth_controller.rs

@@ -5,7 +5,7 @@ use crate::services::login_token_service::LoginTokenValue;
 use crate::services::rate_limiter_service::RatedAction;
 use crate::services::{login_token_service, openid_service, rate_limiter_service, users_service};
 use actix_remote_ip::RemoteIP;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 
 #[derive(serde::Deserialize)]
 pub struct CreateAccountBody {

geneit_backend/src/controllers/couples_controller.rs

@@ -1,12 +1,12 @@
-use crate::controllers::members_controller::RequestDate;
 use crate::controllers::HttpResult;
+use crate::controllers::members_controller::RequestDate;
 use crate::extractors::couple_extractor::FamilyAndCoupleInPath;
 use crate::extractors::family_extractor::FamilyInPath;
 use crate::models::{Couple, CoupleState, MemberID, PhotoID};
 use crate::services::{couples_service, members_service, photos_service};
-use actix_multipart::form::tempfile::TempFile;
 use actix_multipart::form::MultipartForm;
-use actix_web::{web, HttpResponse};
+use actix_multipart::form::tempfile::TempFile;
+use actix_web::{HttpResponse, web};
 
 serde_with::with_prefix!(prefix_wedding "wedding_");
 serde_with::with_prefix!(prefix_divorce "divorce_");

geneit_backend/src/controllers/data_controller.rs

@@ -1,14 +1,14 @@
 use crate::connections::s3_connection;
 use crate::constants;
+use crate::controllers::HttpResult;
 use crate::controllers::couples_controller::CoupleRequest;
 use crate::controllers::members_controller::MemberRequest;
-use crate::controllers::HttpResult;
 use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
 use crate::models::{CoupleID, MemberID, PhotoID};
 use crate::services::photos_service::UploadedFile;
 use crate::services::{couples_service, members_service, photos_service};
-use actix_multipart::form::tempfile::TempFile;
 use actix_multipart::form::MultipartForm;
+use actix_multipart::form::tempfile::TempFile;
 use actix_web::HttpResponse;
 use mime_guess::Mime;
 use std::collections::HashMap;

geneit_backend/src/controllers/families_controller.rs

@@ -1,4 +1,4 @@
-use crate::constants::{StaticConstraints, FAMILY_INVITATION_CODE_LEN};
+use crate::constants::{FAMILY_INVITATION_CODE_LEN, StaticConstraints};
 use crate::controllers::HttpResult;
 use crate::extractors::family_extractor::{FamilyInPath, FamilyInPathWithAdminMembership};
 use crate::models::{FamilyMembership, UserID};
@@ -7,7 +7,7 @@ use crate::services::rate_limiter_service::RatedAction;
 use crate::services::{families_service, rate_limiter_service};
 use crate::utils::string_utils::rand_str;
 use actix_remote_ip::RemoteIP;
-use actix_web::{web, HttpResponse};
+use actix_web::{HttpResponse, web};
 
 #[derive(Debug, serde::Deserialize)]
 pub struct CreateFamilyReq {

geneit_backend/src/controllers/members_controller.rs

@@ -5,9 +5,9 @@ use crate::extractors::member_extractor::FamilyAndMemberInPath;
 use crate::models::{Member, MemberID, PhotoID, Sex};
 use crate::services::{members_service, photos_service};
 use crate::utils::countries_utils;
-use actix_multipart::form::tempfile::TempFile;
 use actix_multipart::form::MultipartForm;
-use actix_web::{web, HttpResponse};
+use actix_multipart::form::tempfile::TempFile;
+use actix_web::{HttpResponse, web};
 
 serde_with::with_prefix!(prefix_birth "birth_");
 serde_with::with_prefix!(prefix_death "death_");

geneit_backend/src/controllers/mod.rs

@@ -1,7 +1,7 @@
 //! # API controller
 
-use actix_web::body::BoxBody;
 use actix_web::HttpResponse;
+use actix_web::body::BoxBody;
 use std::fmt::{Debug, Display, Formatter};
 use zip::result::ZipError;
 

geneit_backend/src/controllers/photos_controller.rs

@@ -3,7 +3,7 @@ use crate::controllers::HttpResult;
 use crate::models::PhotoID;
 use crate::services::photos_service;
 use actix_web::http::header;
-use actix_web::{web, HttpRequest, HttpResponse};
+use actix_web::{HttpRequest, HttpResponse, web};
 use std::ops::Add;
 use std::time::{Duration, UNIX_EPOCH};
 

geneit_backend/src/controllers/users_controller.rs

@@ -9,8 +9,8 @@ use crate::services::login_token_service::LoginToken;
 use crate::services::rate_limiter_service::RatedAction;
 use crate::services::{rate_limiter_service, users_service};
 use actix_remote_ip::RemoteIP;
-use actix_web::web::Json;
 use actix_web::HttpResponse;
+use actix_web::web::Json;
 
 #[derive(serde::Serialize)]
 struct UserAPI<'a> {