Skip to content

Commit 4393254

Browse files
sypharsyphar
committed
upgrade to edition 2024
1 parent 555dc0d commit 4393254

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+632
-492
lines changed

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ readme = "README.md"
66
license = "MIT"
77
repository = "https://github.com/rust-lang/docs.rs"
88
build = "build.rs"
9-
edition = "2021"
9+
edition = "2024"
1010

1111
[workspace]
1212
exclude = [

‎benches/compression.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
2-
use docs_rs::storage::{compress, decompress, CompressionAlgorithm};
1+
use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
2+
use docs_rs::storage::{CompressionAlgorithm, compress, decompress};
33

44
pub fn regex_capture_matches(c: &mut Criterion) {
55
// this isn't a great benchmark because it only tests on one file

‎src/bin/cratesfyi.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ use std::path::PathBuf;
55
use std::str::FromStr;
66
use std::sync::Arc;
77

8-
use anyhow::{anyhow, Context as _, Error, Result};
8+
use anyhow::{Context as _, Error, Result, anyhow};
99
use clap::{Parser, Subcommand, ValueEnum};
1010
use docs_rs::cdn::CdnBackend;
11-
use docs_rs::db::{self, add_path_into_database, CrateId, Overrides, Pool};
11+
use docs_rs::db::{self, CrateId, Overrides, Pool, add_path_into_database};
1212
use docs_rs::repositories::RepositoryStatsUpdater;
1313
use docs_rs::utils::{
14-
get_config, get_crate_pattern_and_priority, list_crate_priorities, queue_builder,
15-
remove_crate_priority, set_config, set_crate_priority, ConfigName,
14+
ConfigName, get_config, get_crate_pattern_and_priority, list_crate_priorities, queue_builder,
15+
remove_crate_priority, set_config, set_crate_priority,
1616
};
1717
use docs_rs::{
18-
start_background_metrics_webserver, start_web_server, AsyncBuildQueue, AsyncStorage,
19-
BuildQueue, Config, Context, Index, InstanceMetrics, PackageKind, RegistryApi, RustwideBuilder,
20-
ServiceMetrics, Storage,
18+
AsyncBuildQueue, AsyncStorage, BuildQueue, Config, Context, Index, InstanceMetrics,
19+
PackageKind, RegistryApi, RustwideBuilder, ServiceMetrics, Storage,
20+
start_background_metrics_webserver, start_web_server,
2121
};
2222
use futures_util::StreamExt;
2323
use humantime::Duration;
2424
use once_cell::sync::OnceCell;
2525
use sentry::{
26-
integrations::panic as sentry_panic, integrations::tracing as sentry_tracing,
27-
TransactionContext,
26+
TransactionContext, integrations::panic as sentry_panic,
27+
integrations::tracing as sentry_tracing,
2828
};
2929
use tokio::runtime::{Builder, Runtime};
3030
use tracing_log::LogTracer;
31-
use tracing_subscriber::{filter::Directive, prelude::*, EnvFilter};
31+
use tracing_subscriber::{EnvFilter, filter::Directive, prelude::*};
3232

3333
fn main() {
3434
// set the global log::logger for backwards compatibility

‎src/build_queue.rs

+43-30
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
use crate::db::{delete_crate, delete_version, update_latest_version_id, CrateId, Pool};
1+
use crate::Context;
2+
use crate::db::{CrateId, Pool, delete_crate, delete_version, update_latest_version_id};
23
use crate::docbuilder::PackageKind;
34
use crate::error::Result;
45
use crate::storage::AsyncStorage;
5-
use crate::utils::{get_config, get_crate_priority, report_error, retry, set_config, ConfigName};
6-
use crate::Context;
7-
use crate::{cdn, BuildPackageSummary};
6+
use crate::utils::{ConfigName, get_config, get_crate_priority, report_error, retry, set_config};
7+
use crate::{BuildPackageSummary, cdn};
88
use crate::{Config, Index, InstanceMetrics, RustwideBuilder};
99
use anyhow::Context as _;
1010
use fn_error_context::context;
11-
use futures_util::{stream::TryStreamExt, StreamExt};
11+
use futures_util::{StreamExt, stream::TryStreamExt};
1212
use sqlx::Connection as _;
1313
use std::collections::HashMap;
1414
use std::sync::Arc;
@@ -125,7 +125,7 @@ impl AsyncBuildQueue {
125125
.pending_count_by_priority()
126126
.await?
127127
.iter()
128-
.filter(|(&priority, _)| priority <= 0)
128+
.filter(|&(&priority, _)| priority <= 0)
129129
.map(|(_, count)| count)
130130
.sum::<usize>())
131131
}
@@ -756,8 +756,10 @@ mod tests {
756756
.await
757757
.name("foo")
758758
.version("0.1.0")
759-
.builds(vec![FakeBuild::default()
760-
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
759+
.builds(vec![
760+
FakeBuild::default()
761+
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
762+
])
761763
.create()
762764
.await?;
763765

@@ -785,8 +787,10 @@ mod tests {
785787
.await
786788
.name("foo")
787789
.version("0.1.0")
788-
.builds(vec![FakeBuild::default()
789-
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
790+
.builds(vec![
791+
FakeBuild::default()
792+
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
793+
])
790794
.create()
791795
.await?;
792796

@@ -833,8 +837,10 @@ mod tests {
833837
.await
834838
.name("foo")
835839
.version("0.1.0")
836-
.builds(vec![FakeBuild::default()
837-
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
840+
.builds(vec![
841+
FakeBuild::default()
842+
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
843+
])
838844
.create()
839845
.await?;
840846

@@ -867,8 +873,10 @@ mod tests {
867873
.await
868874
.name("foo")
869875
.version("0.1.0")
870-
.builds(vec![FakeBuild::default()
871-
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")])
876+
.builds(vec![
877+
FakeBuild::default()
878+
.rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)"),
879+
])
872880
.create()
873881
.await?;
874882

@@ -1090,15 +1098,16 @@ mod tests {
10901098
assert_eq!(metrics.build_time.get_sample_count(), 9);
10911099

10921100
// no invalidations were run since we don't have a distribution id configured
1093-
assert!(env
1094-
.runtime()
1095-
.block_on(async {
1096-
cdn::queued_or_active_crate_invalidations(
1097-
&mut *env.async_db().await.async_conn().await,
1098-
)
1099-
.await
1100-
})?
1101-
.is_empty());
1101+
assert!(
1102+
env.runtime()
1103+
.block_on(async {
1104+
cdn::queued_or_active_crate_invalidations(
1105+
&mut *env.async_db().await.async_conn().await,
1106+
)
1107+
.await
1108+
})?
1109+
.is_empty()
1110+
);
11021111

11031112
Ok(())
11041113
})
@@ -1135,9 +1144,11 @@ mod tests {
11351144

11361145
let queued_invalidations = fetch_invalidations();
11371146
assert_eq!(queued_invalidations.len(), 3);
1138-
assert!(queued_invalidations
1139-
.iter()
1140-
.all(|i| i.krate == "will_succeed"));
1147+
assert!(
1148+
queued_invalidations
1149+
.iter()
1150+
.all(|i| i.krate == "will_succeed")
1151+
);
11411152

11421153
queue.process_next_crate(|krate| {
11431154
assert_eq!("will_fail", krate.name);
@@ -1146,10 +1157,12 @@ mod tests {
11461157

11471158
let queued_invalidations = fetch_invalidations();
11481159
assert_eq!(queued_invalidations.len(), 6);
1149-
assert!(queued_invalidations
1150-
.iter()
1151-
.skip(3)
1152-
.all(|i| i.krate == "will_fail"));
1160+
assert!(
1161+
queued_invalidations
1162+
.iter()
1163+
.skip(3)
1164+
.all(|i| i.krate == "will_fail")
1165+
);
11531166

11541167
Ok(())
11551168
})

0 commit comments

Comments
 (0)