mirror of
https://github.com/Noratrieb/does-it-build.git
synced 2026-01-14 10:25:01 +01:00
Fix failure filtering for std
std failures weren't getting filtered properly since I only checked core.
This commit is contained in:
parent
9de21d4198
commit
3f302c7180
1 changed files with 14 additions and 11 deletions
23
src/web.rs
23
src/web.rs
|
|
@ -140,11 +140,9 @@ async fn web_target(State(state): State<AppState>, Query(query): Query<TargetQue
|
||||||
let mut builds = builds_grouped
|
let mut builds = builds_grouped
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(k, (v1, v2))| (k, v1, v2))
|
.map(|(k, (v1, v2))| (k, v1, v2))
|
||||||
.filter(|(_, build, _)| {
|
.filter(|(_, core_build, std_build)| {
|
||||||
!filter_failures
|
filter_build(filter_failures, core_build)
|
||||||
|| build
|
|| filter_build(filter_failures, std_build)
|
||||||
.as_ref()
|
|
||||||
.is_some_and(|build| build.status == Status::Error)
|
|
||||||
})
|
})
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
builds.sort_by_cached_key(|build| Reverse(build.0.clone()));
|
builds.sort_by_cached_key(|build| Reverse(build.0.clone()));
|
||||||
|
|
@ -216,11 +214,9 @@ async fn web_nightly(State(state): State<AppState>, Query(query): Query<NightlyQ
|
||||||
let mut builds = builds_grouped
|
let mut builds = builds_grouped
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(k, (v1, v2))| (k, v1, v2))
|
.map(|(k, (v1, v2))| (k, v1, v2))
|
||||||
.filter(|(_, build, _)| {
|
.filter(|(_, core_build, std_build)| {
|
||||||
!filter_failures
|
filter_build(filter_failures, core_build)
|
||||||
|| build
|
|| filter_build(filter_failures, std_build)
|
||||||
.as_ref()
|
|
||||||
.is_some_and(|build| build.status == Status::Error)
|
|
||||||
})
|
})
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
builds.sort_by_cached_key(|build| build.0.clone());
|
builds.sort_by_cached_key(|build| build.0.clone());
|
||||||
|
|
@ -324,3 +320,10 @@ impl BuildInfo {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn filter_build(filter_failures: bool, build: &Option<BuildInfo>) -> bool {
|
||||||
|
!filter_failures
|
||||||
|
|| build
|
||||||
|
.as_ref()
|
||||||
|
.is_some_and(|build| build.status == Status::Error)
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue