Merge pull request #11208 from Turbo87/edition

Migrate subcrates to Rust Edition 2024

Author: Turbo87

crates/crates_io_cdn_logs/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crates_io_cdn_logs"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 
 [lints]
 workspace = true

crates/crates_io_cdn_logs/benches/count_downloads.rs

@@ -1,5 +1,5 @@
 use crates_io_cdn_logs::{cloudfront, fastly};
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use std::hint::black_box;
 use std::io::Cursor;
 

crates/crates_io_cdn_logs/examples/count_downloads.rs

@@ -1,11 +1,11 @@
 use anyhow::Context;
 use clap::Parser;
-use crates_io_cdn_logs::{count_downloads, Decompressor};
+use crates_io_cdn_logs::{Decompressor, count_downloads};
 use std::path::PathBuf;
 use tokio::fs::File;
 use tokio::io::BufReader;
 use tracing::level_filters::LevelFilter;
-use tracing_subscriber::{fmt, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt};
 
 #[derive(Debug, clap::Parser)]
 struct Options {

crates/crates_io_cdn_logs/src/cloudfront.rs

@@ -3,8 +3,8 @@
 //! see <https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/AccessLogs.html#LogFileFormat>
 //! and <https://www.w3.org/TR/WD-logfile.html>.
 
-use crate::paths::parse_path;
 use crate::DownloadsMap;
+use crate::paths::parse_path;
 use chrono::NaiveDate;
 use std::borrow::Cow;
 use tokio::io::{AsyncBufRead, AsyncBufReadExt};

crates/crates_io_cdn_logs/src/fastly/mod.rs

@@ -4,8 +4,8 @@
 
 mod json;
 
-use crate::paths::parse_path;
 use crate::DownloadsMap;
+use crate::paths::parse_path;
 use std::borrow::Cow;
 use tokio::io::{AsyncBufRead, AsyncBufReadExt};
 use tracing::{debug_span, instrument, warn};

crates/crates_io_database/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crates_io_database"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 
 [lints]
 workspace = true

crates/crates_io_database/src/models/category.rs

@@ -5,9 +5,8 @@ use diesel::dsl;
 use diesel::prelude::*;
 use diesel_async::scoped_futures::ScopedFutureExt;
 use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
-use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
-use std::future::Future;
+use futures_util::future::BoxFuture;
 
 #[derive(Clone, Identifiable, Queryable, QueryableByName, Debug, Selectable)]
 #[diesel(table_name = categories, check_for_backend(diesel::pg::Pg))]
@@ -97,12 +96,12 @@ impl Category {
             .await
     }
 
-    pub fn toplevel(
+    pub fn toplevel<'a>(
         conn: &mut AsyncPgConnection,
-        sort: &str,
+        sort: &'a str,
         limit: i64,
         offset: i64,
-    ) -> impl Future<Output = QueryResult<Vec<Category>>> {
+    ) -> BoxFuture<'a, QueryResult<Vec<Category>>> {
         use diesel::sql_types::Int8;
 
         let sort_sql = match sort {
@@ -116,6 +115,7 @@ impl Category {
             .bind::<Int8, _>(limit)
             .bind::<Int8, _>(offset)
             .load(conn)
+            .boxed()
     }
 
     pub fn subcategories(

crates/crates_io_database/src/models/token.rs

@@ -145,8 +145,9 @@ mod tests {
         };
         let json = serde_json::to_string(&tok).unwrap();
         assert_some!(json.as_str().find(r#""created_at":"2017-01-06T14:23:11Z""#));
-        assert_some!(json
-            .as_str()
-            .find(r#""last_used_at":"2017-01-06T14:23:12Z""#));
+        assert_some!(
+            json.as_str()
+                .find(r#""last_used_at":"2017-01-06T14:23:12Z""#)
+        );
     }
 }

crates/crates_io_database_dump/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crates_io_database_dump"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 
 [lints]
 workspace = true

crates/crates_io_database_dump/src/configuration.rs

@@ -53,7 +53,7 @@ impl VisibilityConfig {
         }
         let mut ready: VecDeque<&str> = num_deps
             .iter()
-            .filter(|(_, &count)| count == 0)
+            .filter(|&(_, &count)| count == 0)
             .map(|(&table, _)| table)
             .collect();
         let mut result = Vec::with_capacity(ready.len());