studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix and enable collapsible_if lint

Browse Source 
Signed-off-by: June Strawberry <june@vern.cc>
This commit is contained in:
June Strawberry
2026-01-15 17:39:33 -05:00
parent fb102f0e0a
commit 04e66a03d3
54 changed files with 453 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/service/server_keys/get.rs
View File

@@ -82,31 +82,28 @@ pub async fn get_verify_key(
return Ok(result);
}
if notary_first {
if let Ok(result) = self
if notary_first
&& let Ok(result) = self
.get_verify_key_from_notaries(origin, key_id)
.await
{
return Ok(result);
}
{
return Ok(result);
}
if !notary_only {
if let Ok(result) = self
if !notary_only
&& let Ok(result) = self
.get_verify_key_from_origin(origin, key_id)
.await
{
return Ok(result);
}
{
return Ok(result);
}
if !notary_first {
if let Ok(result) = self
if !notary_first
&& let Ok(result) = self
.get_verify_key_from_notaries(origin, key_id)
.await
{
return Ok(result);
}
{
return Ok(result);
}
Err!(BadServerResponse(debug_error!(

16
src/service/server_keys/mod.rs
View File

@@ -141,16 +141,16 @@ pub async fn verify_key_exists(&self, origin: &ServerName, key_id: &ServerSignin
return false;
};
if let Ok(Some(verify_keys)) = keys.get_field::<KeysMap<'_>>("verify_keys") {
if verify_keys.contains_key(key_id) {
return true;
}
if let Ok(Some(verify_keys)) = keys.get_field::<KeysMap<'_>>("verify_keys")
&& verify_keys.contains_key(key_id)
{
return true;
}
if let Ok(Some(old_verify_keys)) = keys.get_field::<KeysMap<'_>>("old_verify_keys") {
if old_verify_keys.contains_key(key_id) {
return true;
}
if let Ok(Some(old_verify_keys)) = keys.get_field::<KeysMap<'_>>("old_verify_keys")
&& old_verify_keys.contains_key(key_id)
{
return true;
}
false