upgrade to edition 2024

rust-lang · Feb 22, 2025 · 4393254 · 4393254
1 parent 555dc0d
commit 4393254
Show file tree

Hide file tree

Showing 55 changed files with 632 additions and 492 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ readme = "README.md"
 license = "MIT"
 repository = "https://github.com/rust-lang/docs.rs"
 build = "build.rs"
-edition = "2021"
+edition = "2024"
 
 [workspace]
 exclude = [

diff --git a/benches/compression.rs b/benches/compression.rs
@@ -1,5 +1,5 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
-use docs_rs::storage::{compress, decompress, CompressionAlgorithm};
+use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
+use docs_rs::storage::{CompressionAlgorithm, compress, decompress};
 
 pub fn regex_capture_matches(c: &mut Criterion) {
     // this isn't a great benchmark because it only tests on one file

diff --git a/src/bin/cratesfyi.rs b/src/bin/cratesfyi.rs
@@ -5,30 +5,30 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
 
-use anyhow::{anyhow, Context as _, Error, Result};
+use anyhow::{Context as _, Error, Result, anyhow};
 use clap::{Parser, Subcommand, ValueEnum};
 use docs_rs::cdn::CdnBackend;
-use docs_rs::db::{self, add_path_into_database, CrateId, Overrides, Pool};
+use docs_rs::db::{self, CrateId, Overrides, Pool, add_path_into_database};
 use docs_rs::repositories::RepositoryStatsUpdater;
 use docs_rs::utils::{
-    get_config, get_crate_pattern_and_priority, list_crate_priorities, queue_builder,
-    remove_crate_priority, set_config, set_crate_priority, ConfigName,
+    ConfigName, get_config, get_crate_pattern_and_priority, list_crate_priorities, queue_builder,
+    remove_crate_priority, set_config, set_crate_priority,
 };
 use docs_rs::{
-    start_background_metrics_webserver, start_web_server, AsyncBuildQueue, AsyncStorage,
-    BuildQueue, Config, Context, Index, InstanceMetrics, PackageKind, RegistryApi, RustwideBuilder,
-    ServiceMetrics, Storage,
+    AsyncBuildQueue, AsyncStorage, BuildQueue, Config, Context, Index, InstanceMetrics,
+    PackageKind, RegistryApi, RustwideBuilder, ServiceMetrics, Storage,
+    start_background_metrics_webserver, start_web_server,
 };
 use futures_util::StreamExt;
 use humantime::Duration;
 use once_cell::sync::OnceCell;
 use sentry::{
-    integrations::panic as sentry_panic, integrations::tracing as sentry_tracing,
-    TransactionContext,
+    TransactionContext, integrations::panic as sentry_panic,
+    integrations::tracing as sentry_tracing,
 };
 use tokio::runtime::{Builder, Runtime};
 use tracing_log::LogTracer;
-use tracing_subscriber::{filter::Directive, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, filter::Directive, prelude::*};
 
 fn main() {
     // set the global log::logger for backwards compatibility

diff --git a/src/build_queue.rs b/src/build_queue.rs
@@ -1,14 +1,14 @@
-use crate::db::{delete_crate, delete_version, update_latest_version_id, CrateId, Pool};
+use crate::Context;
+use crate::db::{CrateId, Pool, delete_crate, delete_version, update_latest_version_id};
 use crate::docbuilder::PackageKind;
 use crate::error::Result;
 use crate::storage::AsyncStorage;
-use crate::utils::{get_config, get_crate_priority, report_error, retry, set_config, ConfigName};
-use crate::Context;
-use crate::{cdn, BuildPackageSummary};
+use crate::utils::{ConfigName, get_config, get_crate_priority, report_error, retry, set_config};
+use crate::{BuildPackageSummary, cdn};
 use crate::{Config, Index, InstanceMetrics, RustwideBuilder};
 use anyhow::Context as _;
 use fn_error_context::context;
-use futures_util::{stream::TryStreamExt, StreamExt};
+use futures_util::{StreamExt, stream::TryStreamExt};
 use sqlx::Connection as _;
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -125,7 +125,7 @@ impl AsyncBuildQueue {
             .pending_count_by_priority()
             .await?
             .iter()
-            .filter(|(&priority, _)| priority <= 0)
+            .filter(|&(&priority, _)| priority <= 0)
             .map(|(_, count)| count)
             .sum::<usize>())
     }
@@ -756,8 +756,10 @@ mod tests {
                 .await
                 .name("foo")
                 .version("0.1.0")
-                .builds(vec![FakeBuild::default()
-                    .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
+                .builds(vec![
+                    FakeBuild::default()
+                        .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
+                ])
                 .create()
                 .await?;
 
@@ -785,8 +787,10 @@ mod tests {
                 .await
                 .name("foo")
                 .version("0.1.0")
-                .builds(vec![FakeBuild::default()
-                    .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
+                .builds(vec![
+                    FakeBuild::default()
+                        .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
+                ])
                 .create()
                 .await?;
 
@@ -833,8 +837,10 @@ mod tests {
                 .await
                 .name("foo")
                 .version("0.1.0")
-                .builds(vec![FakeBuild::default()
-                    .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
+                .builds(vec![
+                    FakeBuild::default()
+                        .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
+                ])
                 .create()
                 .await?;
 
@@ -867,8 +873,10 @@ mod tests {
                 .await
                 .name("foo")
                 .version("0.1.0")
-                .builds(vec![FakeBuild::default()
-                    .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
+                .builds(vec![
+                    FakeBuild::default()
+                        .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
+                ])
                 .create()
                 .await?;
 
@@ -1090,15 +1098,16 @@ mod tests {
             assert_eq!(metrics.build_time.get_sample_count(), 9);
 
             // no invalidations were run since we don't have a distribution id configured
-            assert!(env
-                .runtime()
-                .block_on(async {
-                    cdn::queued_or_active_crate_invalidations(
-                        &mut *env.async_db().await.async_conn().await,
-                    )
-                    .await
-                })?
-                .is_empty());
+            assert!(
+                env.runtime()
+                    .block_on(async {
+                        cdn::queued_or_active_crate_invalidations(
+                            &mut *env.async_db().await.async_conn().await,
+                        )
+                        .await
+                    })?
+                    .is_empty()
+            );
 
             Ok(())
         })
@@ -1135,9 +1144,11 @@ mod tests {
 
             let queued_invalidations = fetch_invalidations();
             assert_eq!(queued_invalidations.len(), 3);
-            assert!(queued_invalidations
-                .iter()
-                .all(|i| i.krate == "will_succeed"));
+            assert!(
+                queued_invalidations
+                    .iter()
+                    .all(|i| i.krate == "will_succeed")
+            );
 
             queue.process_next_crate(|krate| {
                 assert_eq!("will_fail", krate.name);
@@ -1146,10 +1157,12 @@ mod tests {
 
             let queued_invalidations = fetch_invalidations();
             assert_eq!(queued_invalidations.len(), 6);
-            assert!(queued_invalidations
-                .iter()
-                .skip(3)
-                .all(|i| i.krate == "will_fail"));
+            assert!(
+                queued_invalidations
+                    .iter()
+                    .skip(3)
+                    .all(|i| i.krate == "will_fail")
+            );
 
             Ok(())
         })