diff --git a/src/engine/state.rs b/src/engine/state.rs index 09a16e9..5eae991 100644 --- a/src/engine/state.rs +++ b/src/engine/state.rs @@ -439,7 +439,7 @@ impl Network { /// Every online user, full detail, sorted by nick. pub fn users_detailed(&self) -> Vec { let mut v: Vec = self.users.values().map(|u| self.to_netuser(u)).collect(); - v.sort_by(|a, b| a.nick.to_lowercase().cmp(&b.nick.to_lowercase())); + v.sort_by_key(|a| a.nick.to_lowercase()); v } diff --git a/src/panel/mod.rs b/src/panel/mod.rs index 5f355af..30ddb2a 100644 --- a/src/panel/mod.rs +++ b/src/panel/mod.rs @@ -793,7 +793,7 @@ async fn page_opers(oper: Oper, State(st): State) -> Html { }) .collect(); drop(e); - rows.sort_by(|a, b| a.name.to_lowercase().cmp(&b.name.to_lowercase())); + rows.sort_by_key(|a| a.name.to_lowercase()); html(OpersTpl { chrome: chrome(&st, &oper, "opers"), rows }) } @@ -837,7 +837,7 @@ async fn page_registrations(oper: Oper, State(st): State) -> Html = counts.into_iter().map(|c| (c, pct(c as usize, days_max as usize))).collect(); - accts.sort_by(|a, b| b.ts.cmp(&a.ts)); + accts.sort_by_key(|a| std::cmp::Reverse(a.ts)); let recent: Vec = accts .into_iter() .take(14) @@ -1044,13 +1044,13 @@ async fn page_access(oper: Oper, State(st): State) -> Html { name, tier, perms, - expires: expires.map(|t| tmpl::fmt_date(t)).unwrap_or_else(|| "permanent".into()), + expires: expires.map(tmpl::fmt_date).unwrap_or_else(|| "permanent".into()), } }) .collect(); let _ = now; drop(e); - grants.sort_by(|a, b| a.name.to_lowercase().cmp(&b.name.to_lowercase())); + grants.sort_by_key(|a| a.name.to_lowercase()); let total = grants.len(); html(AccessTpl { chrome: chrome(&st, &oper, "access"), grants, total }) } @@ -1279,7 +1279,7 @@ async fn health(State(st): State) -> Response { async fn live(oper: Oper, State(st): State, Query(p): Query>) -> Response { let _ = oper; let since: u64 = p.get("since").and_then(|s| s.parse().ok()).unwrap_or(0); - let want_counts = p.get("counts").is_some(); + let want_counts = p.contains_key("counts"); let e = st.engine.lock().await; let counts = if want_counts { json!({