Fix rustfmt issues

Author: Turbo87

src/app.rs

@@ -1,7 +1,7 @@
 //! Application-wide components in a struct accessible from each request
 
 use crate::config;
-use crate::db::{connection_url, make_manager_config, ConnectionConfig};
+use crate::db::{ConnectionConfig, connection_url, make_manager_config};
 use std::sync::Arc;
 
 use crate::email::Emails;
@@ -12,9 +12,9 @@ use axum::extract::{FromRef, FromRequestParts, State};
 use crates_io_github::GitHubClient;
 use deadpool_diesel::Runtime;
 use derive_more::Deref;
-use diesel_async::pooled_connection::deadpool::Pool as DeadpoolPool;
-use diesel_async::pooled_connection::AsyncDieselConnectionManager;
 use diesel_async::AsyncPgConnection;
+use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+use diesel_async::pooled_connection::deadpool::Pool as DeadpoolPool;
 use oauth2::basic::BasicClient;
 use oauth2::{EndpointNotSet, EndpointSet};
 

src/auth.rs

@@ -4,7 +4,7 @@ use crate::middleware::log_request::RequestLogExt;
 use crate::models::token::{CrateScope, EndpointScope};
 use crate::models::{ApiToken, User};
 use crate::util::errors::{
-    account_locked, forbidden, internal, AppResult, InsecurelyGeneratedTokenRevoked,
+    AppResult, InsecurelyGeneratedTokenRevoked, account_locked, forbidden, internal,
 };
 use crate::util::token::HashedToken;
 use chrono::Utc;

src/bin/background-worker.rs

@@ -19,14 +19,14 @@ use crates_io::db::make_manager_config;
 use crates_io::fastly::Fastly;
 use crates_io::storage::Storage;
 use crates_io::worker::{Environment, RunnerExt};
-use crates_io::{config, Emails};
+use crates_io::{Emails, config};
 use crates_io::{db, ssh};
 use crates_io_env_vars::var;
 use crates_io_index::RepositoryConfig;
 use crates_io_team_repo::TeamRepoImpl;
 use crates_io_worker::Runner;
-use diesel_async::pooled_connection::deadpool::Pool;
 use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+use diesel_async::pooled_connection::deadpool::Pool;
 use object_store::prefix::PrefixStore;
 use reqwest::Client;
 use secrecy::ExposeSecret;

src/bin/crates-admin/dialoguer.rs

@@ -1,4 +1,4 @@
-use ::dialoguer::{theme::Theme, Confirm};
+use ::dialoguer::{Confirm, theme::Theme};
 use crates_io::tasks::spawn_blocking;
 
 pub async fn confirm(msg: impl Into<String>) -> anyhow::Result<bool> {

src/bin/crates-admin/migrate.rs

@@ -1,9 +1,9 @@
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use crates_io::tasks::spawn_blocking;
-use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use diesel_async::AsyncPgConnection;
+use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use diesel_migrations::{
-    embed_migrations, EmbeddedMigrations, HarnessWithOutput, MigrationHarness,
+    EmbeddedMigrations, HarnessWithOutput, MigrationHarness, embed_migrations,
 };
 
 static CATEGORIES_TOML: &str = include_str!("../../boot/categories.toml");

src/bin/crates-admin/render_readmes.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use crates_io::db;
 use crates_io::models::Version;
 use crates_io::schema::{crates, readme_renderings, versions};
@@ -17,7 +17,7 @@ use crates_io_tarball::{Manifest, StringOrBool};
 use diesel::prelude::*;
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
-use reqwest::{header, Client};
+use reqwest::{Client, header};
 use std::str::FromStr;
 use tokio_tar::{self, Archive};
 

src/bin/server.rs

@@ -2,7 +2,7 @@
 extern crate tracing;
 
 use crates_io::middleware::normalize_path::normalize_path;
-use crates_io::{metrics::LogEncoder, App, Emails};
+use crates_io::{App, Emails, metrics::LogEncoder};
 use std::{sync::Arc, time::Duration};
 
 use axum::ServiceExt;
@@ -12,7 +12,7 @@ use reqwest::Client;
 use std::io::Write;
 use std::net::SocketAddr;
 use tokio::net::TcpListener;
-use tokio::signal::unix::{signal, SignalKind};
+use tokio::signal::unix::{SignalKind, signal};
 use tower::Layer;
 
 const CORE_THREADS: usize = 4;
@@ -106,11 +106,13 @@ fn log_instance_metrics_thread(app: Arc<App>) {
         None => return,
     };
 
-    std::thread::spawn(move || loop {
-        if let Err(err) = log_instance_metrics_inner(&app) {
-            error!(?err, "log_instance_metrics error");
+    std::thread::spawn(move || {
+        loop {
+            if let Err(err) = log_instance_metrics_inner(&app) {
+                error!(?err, "log_instance_metrics error");
+            }
+            std::thread::sleep(interval);
         }
-        std::thread::sleep(interval);
     });
 }
 

src/config/database_pools.rs

@@ -11,8 +11,8 @@
 //! - `READ_ONLY_MODE`: If defined (even as empty) then force all connections to be read-only.
 //! - `DB_TCP_TIMEOUT_MS`: TCP timeout in milliseconds. See the doc comment for more details.
 
-use crate::config::Base;
 use crate::Env;
+use crate::config::Base;
 use anyhow::anyhow;
 use crates_io_env_vars::{required_var, var, var_parsed};
 use secrecy::SecretString;

src/config/sentry.rs

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use crates_io_env_vars::{required_var, var, var_parsed};
-use sentry::types::Dsn;
 use sentry::IntoDsn;
+use sentry::types::Dsn;
 
 pub struct SentryConfig {
     pub dsn: Option<Dsn>,

src/config/server.rs

@@ -1,15 +1,15 @@
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use ipnetwork::IpNetwork;
 use oauth2::{ClientId, ClientSecret};
 use url::Url;
 
-use crate::rate_limiter::{LimitedAction, RateLimiterConfig};
 use crate::Env;
+use crate::rate_limiter::{LimitedAction, RateLimiterConfig};
 
 use super::base::Base;
 use super::database_pools::DatabasePools;
-use crate::config::cdn_log_storage::CdnLogStorageConfig;
 use crate::config::CdnLogQueueConfig;
+use crate::config::cdn_log_storage::CdnLogStorageConfig;
 use crate::middleware::cargo_compat::StatusCodeConfig;
 use crate::storage::StorageConfig;
 use crates_io_env_vars::{list, list_parsed, required_var, var, var_parsed};
@@ -179,7 +179,11 @@ impl Server {
             font-src https://code.cdn.mozilla.net; \
             img-src *; \
             object-src 'none'",
-            cdn_domain = storage.cdn_prefix.as_ref().map(|cdn_prefix| format!("https://{cdn_prefix}")).unwrap_or_default()
+            cdn_domain = storage
+                .cdn_prefix
+                .as_ref()
+                .map(|cdn_prefix| format!("https://{cdn_prefix}"))
+                .unwrap_or_default()
         );
 
         Ok(Server {
@@ -259,7 +263,9 @@ fn parse_cidr_block(block: &str) -> anyhow::Result<IpNetwork> {
     };
 
     if cidr.prefix() < host_prefix {
-        return Err(anyhow!("WEB_PAGE_OFFSET_CIDR_BLOCKLIST only allows CIDR blocks with a host prefix of at least 16 bits (IPv4) or 64 bits (IPv6)."));
+        return Err(anyhow!(
+            "WEB_PAGE_OFFSET_CIDR_BLOCKLIST only allows CIDR blocks with a host prefix of at least 16 bits (IPv4) or 64 bits (IPv6)."
+        ));
     }
 
     Ok(cidr)