Skip to content

Commit 2d7b075

Browse files
committed
fix(dev): handly clippy warnings in benches and make CI Docker cache more resilient
1 parent 4dec574 commit 2d7b075

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ jobs:
204204
load: true
205205
set: |
206206
retrack.cache-from=type=gha,scope=retrack
207-
retrack.cache-to=type=gha,mode=max,scope=retrack
207+
retrack.cache-to=type=gha,mode=max,scope=retrack,ignore-error=true
208208
retrack_web_scraper.cache-from=type=gha,scope=retrack-web-scraper
209-
retrack_web_scraper.cache-to=type=gha,mode=max,scope=retrack-web-scraper
209+
retrack_web_scraper.cache-to=type=gha,mode=max,scope=retrack-web-scraper,ignore-error=true
210210
secutils_api.cache-from=type=gha,scope=secutils-api
211-
secutils_api.cache-to=type=gha,mode=max,scope=secutils-api
211+
secutils_api.cache-to=type=gha,mode=max,scope=secutils-api,ignore-error=true
212212
secutils_webui.cache-from=type=gha,scope=secutils-webui
213-
secutils_webui.cache-to=type=gha,mode=max,scope=secutils-webui
213+
secutils_webui.cache-to=type=gha,mode=max,scope=secutils-webui,ignore-error=true
214214
215215
- name: Save Docker images
216216
run: >

benches/js-runtime-perf/src/report.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ fn detect_cpu_model() -> String {
118118
#[cfg(target_os = "linux")]
119119
if let Ok(contents) = fs::read_to_string("/proc/cpuinfo") {
120120
for line in contents.lines() {
121-
if let Some(rest) = line.strip_prefix("model name") {
122-
if let Some(idx) = rest.find(':') {
123-
return rest[idx + 1..].trim().to_string();
124-
}
121+
if let Some(rest) = line.strip_prefix("model name")
122+
&& let Some(idx) = rest.find(':')
123+
{
124+
return rest[idx + 1..].trim().to_string();
125125
}
126126
}
127127
}

src/search/search_index.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,14 +527,14 @@ mod tests {
527527
index.upsert(&public_item)?;
528528

529529
let mut public_items = index.search(SearchFilter::default())?;
530-
public_items.sort_by(|item_a, item_b| item_a.id.cmp(&item_b.id));
530+
public_items.sort_by_key(|item| item.id);
531531
assert_eq!(public_items, vec![public_item.clone()]);
532532

533533
let mut public_and_user_items = index.search(
534534
SearchFilter::default()
535535
.with_user_id(uuid!("00000000-0000-0000-0000-000000000003").into()),
536536
)?;
537-
public_and_user_items.sort_by(|item_a, item_b| item_a.id.cmp(&item_b.id));
537+
public_and_user_items.sort_by_key(|item| item.id);
538538
assert_eq!(
539539
public_and_user_items,
540540
vec![item_user_3, public_item.clone()]
@@ -544,7 +544,7 @@ mod tests {
544544
SearchFilter::default()
545545
.with_user_id(uuid!("00000000-0000-0000-0000-000000000004").into()),
546546
)?;
547-
public_and_user_items.sort_by(|item_a, item_b| item_a.id.cmp(&item_b.id));
547+
public_and_user_items.sort_by_key(|item_a| item_a.id);
548548
assert_eq!(
549549
public_and_user_items,
550550
vec![item_user_4, public_item.clone()]
@@ -585,7 +585,7 @@ mod tests {
585585
index.upsert(&item_2)?;
586586

587587
let mut items = index.search(SearchFilter::default())?;
588-
items.sort_by(|item_a, item_b| item_a.id.cmp(&item_b.id));
588+
items.sort_by_key(|item_a| item_a.id);
589589
assert_eq!(items, vec![item_1.clone(), item_2.clone()]);
590590

591591
index.remove(item_1.id)?;

0 commit comments

Comments
 (0)