flake.lock: bump, Cargo.lock: bump, Cargo.toml: update inputs, format, etc

src/server/command.rs

@@ -12,7 +12,7 @@ use std::os::unix::net::UnixStream as StdUnixStream;
 use tokio::net::UnixStream as TokioUnixStream;
 
 use crate::core::common::UnixUser;
-use crate::core::protocol::{create_server_to_client_message_stream, Response};
+use crate::core::protocol::{Response, create_server_to_client_message_stream};
 use crate::server::config::read_config_from_path_with_arg_overrides;
 use crate::server::server_loop::listen_for_incoming_connections;
 use crate::server::{

src/server/config.rs

@@ -1,9 +1,9 @@
 use std::{fs, path::PathBuf, time::Duration};
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use clap::Parser;
 use serde::{Deserialize, Serialize};
-use sqlx::{mysql::MySqlConnectOptions, ConnectOptions, MySqlConnection};
+use sqlx::{ConnectOptions, MySqlConnection, mysql::MySqlConnectOptions};
 
 use crate::core::common::DEFAULT_CONFIG_PATH;
 

src/server/server_loop.rs

@@ -4,20 +4,20 @@ use futures_util::{SinkExt, StreamExt};
 use indoc::concatdoc;
 use tokio::net::{UnixListener, UnixStream};
 
-use sqlx::prelude::*;
 use sqlx::MySqlConnection;
+use sqlx::prelude::*;
 
 use crate::core::protocol::SetPasswordError;
 use crate::server::sql::database_operations::list_databases;
 use crate::{
     core::{
-        common::{UnixUser, DEFAULT_SOCKET_PATH},
+        common::{DEFAULT_SOCKET_PATH, UnixUser},
         protocol::request_response::{
-            create_server_to_client_message_stream, Request, Response, ServerToClientMessageStream,
+            Request, Response, ServerToClientMessageStream, create_server_to_client_message_stream,
         },
     },
     server::{
-        config::{create_mysql_connection_from_config, ServerConfig},
+        config::{ServerConfig, create_mysql_connection_from_config},
         sql::{
             database_operations::{create_databases, drop_databases, list_all_databases_for_user},
             database_privilege_operations::{

src/server/sql/database_operations.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
-use sqlx::prelude::*;
 use sqlx::MySqlConnection;
+use sqlx::prelude::*;
 
 use serde::{Deserialize, Serialize};
 

src/server/sql/database_privilege_operations.rs

@@ -19,11 +19,11 @@ use std::collections::{BTreeMap, BTreeSet};
 use indoc::indoc;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use sqlx::{mysql::MySqlRow, prelude::*, MySqlConnection};
+use sqlx::{MySqlConnection, mysql::MySqlRow, prelude::*};
 
 use crate::{
     core::{
-        common::{rev_yn, yn, UnixUser},
+        common::{UnixUser, rev_yn, yn},
         database_privileges::{DatabasePrivilegeChange, DatabasePrivilegesDiff},
         protocol::{
             DiffDoesNotApplyError, GetAllDatabasesPrivilegeData, GetAllDatabasesPrivilegeDataError,
@@ -280,9 +280,8 @@ async fn unsafe_apply_privilege_diff(
                 .map(|field| quote_identifier(field))
                 .join(",");
 
-            let question_marks = std::iter::repeat("?")
-                .take(DATABASE_PRIVILEGE_FIELDS.len())
-                .join(",");
+            let question_marks =
+                std::iter::repeat_n("?", DATABASE_PRIVILEGE_FIELDS.len()).join(",");
 
             sqlx::query(
                 format!("INSERT INTO `db` ({}) VALUES ({})", tables, question_marks).as_str(),

src/server/sql/user_operations.rs

@@ -4,8 +4,8 @@ use std::collections::BTreeMap;
 
 use serde::{Deserialize, Serialize};
 
-use sqlx::prelude::*;
 use sqlx::MySqlConnection;
+use sqlx::prelude::*;
 
 use crate::{
     core::{