Skip to content

Commit 64347d9

Browse files
sypharsyphar
committed
fix new clippy errors
1 parent 3551a7b commit 64347d9

File tree

13 files changed

+146
-160
lines changed

13 files changed

+146
-160
lines changed

‎src/cdn.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,9 @@ pub(crate) async fn handle_queued_invalidation_requests(
381381
if let Some(status) = cdn
382382
.invalidation_status(distribution_id, &row.cdn_reference)
383383
.await?
384+
&& !status.completed
384385
{
385-
if !status.completed {
386-
active_invalidations.push(status);
387-
}
386+
active_invalidations.push(status);
388387
}
389388
}
390389

@@ -453,11 +452,10 @@ pub(crate) async fn handle_queued_invalidation_requests(
453452
)
454453
.fetch_one(&mut *conn)
455454
.await?
455+
&& (now - min_queued).to_std().unwrap_or_default() >= config.cdn_max_queued_age
456456
{
457-
if (now - min_queued).to_std().unwrap_or_default() >= config.cdn_max_queued_age {
458-
full_invalidation(cdn, metrics, conn, distribution_id).await?;
459-
return Ok(());
460-
}
457+
full_invalidation(cdn, metrics, conn, distribution_id).await?;
458+
return Ok(());
461459
}
462460

463461
// create new an invalidation for the queued path patterns

‎src/db/add_package.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ mod test {
649649
use crate::test::*;
650650
use crate::utils::CargoMetadata;
651651
use chrono::NaiveDate;
652+
use std::slice;
652653
use test_case::test_case;
653654

654655
#[test]
@@ -965,7 +966,7 @@ mod test {
965966
kind: OwnerKind::User,
966967
};
967968

968-
update_owners_in_database(&mut conn, &[owner1.clone()], crate_id).await?;
969+
update_owners_in_database(&mut conn, slice::from_ref(&owner1), crate_id).await?;
969970

970971
let owner_def = sqlx::query!(
971972
r#"SELECT login, avatar, kind as "kind: OwnerKind"
@@ -1005,7 +1006,7 @@ mod test {
10051006
kind: OwnerKind::User,
10061007
};
10071008

1008-
update_owners_in_database(&mut conn, &[owner1.clone()], crate_id).await?;
1009+
update_owners_in_database(&mut conn, slice::from_ref(&owner1), crate_id).await?;
10091010

10101011
let owner_def = sqlx::query!(
10111012
r#"SELECT login, avatar, kind as "kind: OwnerKind"
@@ -1056,7 +1057,7 @@ mod test {
10561057
avatar: "avatar2".into(),
10571058
kind: OwnerKind::Team,
10581059
};
1059-
update_owners_in_database(&mut conn, &[updated_owner.clone()], crate_id).await?;
1060+
update_owners_in_database(&mut conn, slice::from_ref(&updated_owner), crate_id).await?;
10601061

10611062
let owner_def =
10621063
sqlx::query!(r#"SELECT login, avatar, kind as "kind: OwnerKind" FROM owners"#)

‎src/docbuilder/rustwide_builder.rs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -586,16 +586,15 @@ impl RustwideBuilder {
586586
self.execute_build(build_id, name, version, default_target, true, build, &limits, &metadata, false, collect_metrics)?;
587587
}
588588

589-
if res.result.successful {
590-
if let Some(name) = res.cargo_metadata.root().library_name() {
589+
if res.result.successful
590+
&& let Some(name) = res.cargo_metadata.root().library_name() {
591591
let host_target = build.host_target_dir();
592592
has_docs = host_target
593593
.join(default_target)
594594
.join("doc")
595595
.join(name)
596596
.is_dir();
597597
}
598-
}
599598

600599
let mut target_build_logs = HashMap::new();
601600
let documentation_size = if has_docs {
@@ -1077,19 +1076,18 @@ impl RustwideBuilder {
10771076
})
10781077
};
10791078

1080-
if collect_metrics {
1081-
if let Some(compiler_metric_target_dir) = &self.config.compiler_metrics_collection_path
1082-
{
1083-
let metric_output = build.host_target_dir().join("metrics/");
1084-
info!(
1085-
"found {} files in metric dir, copy over to {} (exists: {})",
1086-
fs::read_dir(&metric_output)?.count(),
1087-
&compiler_metric_target_dir.to_string_lossy(),
1088-
&compiler_metric_target_dir.exists(),
1089-
);
1090-
copy_dir_all(&metric_output, compiler_metric_target_dir)?;
1091-
fs::remove_dir_all(&metric_output)?;
1092-
}
1079+
if collect_metrics
1080+
&& let Some(compiler_metric_target_dir) = &self.config.compiler_metrics_collection_path
1081+
{
1082+
let metric_output = build.host_target_dir().join("metrics/");
1083+
info!(
1084+
"found {} files in metric dir, copy over to {} (exists: {})",
1085+
fs::read_dir(&metric_output)?.count(),
1086+
&compiler_metric_target_dir.to_string_lossy(),
1087+
&compiler_metric_target_dir.exists(),
1088+
);
1089+
copy_dir_all(&metric_output, compiler_metric_target_dir)?;
1090+
fs::remove_dir_all(&metric_output)?;
10931091
}
10941092

10951093
// For proc-macros, cargo will put the output in `target/doc`.

‎src/storage/s3.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ where
5151
match self {
5252
Ok(result) => Ok(result),
5353
Err(err) => {
54-
if let Some(err_code) = err.code() {
55-
if NOT_FOUND_ERROR_CODES.contains(&err_code) {
56-
return Err(super::PathNotFoundError.into());
57-
}
54+
if let Some(err_code) = err.code()
55+
&& NOT_FOUND_ERROR_CODES.contains(&err_code)
56+
{
57+
return Err(super::PathNotFoundError.into());
5858
}
5959

60-
if let SdkError::ServiceError(err) = &err {
61-
if err.raw().status().as_u16() == http::StatusCode::NOT_FOUND.as_u16() {
62-
return Err(super::PathNotFoundError.into());
63-
}
60+
if let SdkError::ServiceError(err) = &err
61+
&& err.raw().status().as_u16() == http::StatusCode::NOT_FOUND.as_u16()
62+
{
63+
return Err(super::PathNotFoundError.into());
6464
}
6565

6666
Err(err.into())

‎src/test/mod.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ impl AxumRouterTestExt for axum::Router {
239239
let mut path = path.to_owned();
240240
for _ in 0..=10 {
241241
let response = self.get(&path).await?;
242-
if response.status().is_redirection() {
243-
if let Some(target) = response.redirect_target() {
244-
path = target.to_owned();
245-
continue;
246-
}
242+
if response.status().is_redirection()
243+
&& let Some(target) = response.redirect_target()
244+
{
245+
path = target.to_owned();
246+
continue;
247247
}
248248
return Ok(response);
249249
}
@@ -409,10 +409,10 @@ impl TestEnvironment {
409409
.expect("failed to cleanup after tests");
410410
}
411411

412-
if let Some(config) = self.config.get() {
413-
if config.local_archive_cache_path.exists() {
414-
fs::remove_dir_all(&config.local_archive_cache_path).unwrap();
415-
}
412+
if let Some(config) = self.config.get()
413+
&& config.local_archive_cache_path.exists()
414+
{
415+
fs::remove_dir_all(&config.local_archive_cache_path).unwrap();
416416
}
417417
}
418418

@@ -610,7 +610,7 @@ impl TestEnvironment {
610610
.expect("could not build axum app")
611611
}
612612

613-
pub(crate) async fn fake_release(&self) -> fakes::FakeRelease {
613+
pub(crate) async fn fake_release(&self) -> fakes::FakeRelease<'_> {
614614
fakes::FakeRelease::new(self.async_db().await, self.async_storage().await)
615615
}
616616
}

‎src/utils/consistency/diff.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ where
6565
// is coming from the build queue, not the `releases`
6666
// table.
6767
// In this case, we skip this check.
68-
if let Some(db_yanked) = db_release.yanked {
69-
if db_yanked != index_yanked {
70-
result.push(Difference::ReleaseYank(
71-
db_crate.name.clone(),
72-
db_release.version.clone(),
73-
index_yanked,
74-
));
75-
}
68+
if let Some(db_yanked) = db_release.yanked
69+
&& db_yanked != index_yanked
70+
{
71+
result.push(Difference::ReleaseYank(
72+
db_crate.name.clone(),
73+
db_release.version.clone(),
74+
index_yanked,
75+
));
7676
}
7777
}
7878
Left(db_release) => result.push(Difference::ReleaseNotInIndex(

‎src/utils/consistency/mod.rs‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,53 +99,47 @@ where
9999

100100
match difference {
101101
diff::Difference::CrateNotInIndex(name) => {
102-
if !dry_run {
103-
if let Err(err) = delete::delete_crate(&mut conn, &storage, &config, name).await
104-
{
105-
warn!("{:?}", err);
106-
}
102+
if !dry_run
103+
&& let Err(err) = delete::delete_crate(&mut conn, &storage, &config, name).await
104+
{
105+
warn!("{:?}", err);
107106
}
108107
result.crates_deleted += 1;
109108
}
110109
diff::Difference::CrateNotInDb(name, versions) => {
111110
for version in versions {
112-
if !dry_run {
113-
if let Err(err) = build_queue
111+
if !dry_run
112+
&& let Err(err) = build_queue
114113
.add_crate(name, version, BUILD_PRIORITY, None)
115114
.await
116-
{
117-
warn!("{:?}", err);
118-
}
115+
{
116+
warn!("{:?}", err);
119117
}
120118
result.builds_queued += 1;
121119
}
122120
}
123121
diff::Difference::ReleaseNotInIndex(name, version) => {
124-
if !dry_run {
125-
if let Err(err) =
122+
if !dry_run
123+
&& let Err(err) =
126124
delete::delete_version(&mut conn, &storage, &config, name, version).await
127-
{
128-
warn!("{:?}", err);
129-
}
125+
{
126+
warn!("{:?}", err);
130127
}
131128
result.releases_deleted += 1;
132129
}
133130
diff::Difference::ReleaseNotInDb(name, version) => {
134-
if !dry_run {
135-
if let Err(err) = build_queue
131+
if !dry_run
132+
&& let Err(err) = build_queue
136133
.add_crate(name, version, BUILD_PRIORITY, None)
137134
.await
138-
{
139-
warn!("{:?}", err);
140-
}
135+
{
136+
warn!("{:?}", err);
141137
}
142138
result.builds_queued += 1;
143139
}
144140
diff::Difference::ReleaseYank(name, version, yanked) => {
145-
if !dry_run {
146-
if let Err(err) = build_queue.set_yanked(name, version, *yanked).await {
147-
warn!("{:?}", err);
148-
}
141+
if !dry_run && let Err(err) = build_queue.set_yanked(name, version, *yanked).await {
142+
warn!("{:?}", err);
149143
}
150144
result.yanks_corrected += 1;
151145
}

‎src/web/extractors.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ where
129129
parts: &mut Parts,
130130
_state: &S,
131131
) -> Result<Option<Self>, Self::Rejection> {
132-
if let Some((_rest, last_component)) = parts.uri.path().rsplit_once('/') {
133-
if let Some((_rest, ext)) = last_component.rsplit_once('.') {
134-
return Ok(Some(PathFileExtension(ext.to_string())));
135-
}
132+
if let Some((_rest, last_component)) = parts.uri.path().rsplit_once('/')
133+
&& let Some((_rest, ext)) = last_component.rsplit_once('.')
134+
{
135+
return Ok(Some(PathFileExtension(ext.to_string())));
136136
}
137137

138138
Ok(None)

‎src/web/highlight.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ fn select_syntax(
5555
default: Option<&str>,
5656
) -> &'static SyntaxReference {
5757
name.and_then(|name| {
58-
if name.is_empty() {
59-
if let Some(default) = default {
60-
return SYNTAXES.find_syntax_by_token(default);
61-
}
58+
if name.is_empty()
59+
&& let Some(default) = default
60+
{
61+
return SYNTAXES.find_syntax_by_token(default);
6262
}
6363
SYNTAXES.find_syntax_by_token(name).or_else(|| {
6464
name.rsplit_once('.')

‎src/web/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ fn semver_match<'a, F: Fn(&Release) -> bool>(
257257
// So when we only have pre-releases, `VersionReq::STAR` would lead to an
258258
// empty result.
259259
// In this case we just return the latest prerelease instead of nothing.
260-
return releases.iter().find(|release| filter(release));
260+
releases.iter().find(|release| filter(release))
261261
} else {
262262
None
263263
}

0 commit comments

Comments
 (0)