read-floor: clippy's collapsed ifs and needless borrows in the image fold

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-11-03 08:19:25 +01:00
commit 57568c1028
3 changed files with 14 additions and 14 deletions

View file

@ -102,10 +102,10 @@ impl Image {
let receipts = receipts.clone()?;
let index = AdmissionIndex::build(&receipts)?;
for (type_id, keyed) in envelopes {
if kind_of_type(type_id).is_some() {
if let Some(key) = keyed.keys().find(|key| !index.contains(type_id, key)) {
return Err(integrity(type_id, key, "has no commit receipt"));
}
if kind_of_type(type_id).is_some()
&& let Some(key) = keyed.keys().find(|key| !index.contains(type_id, key))
{
return Err(integrity(type_id, key, "has no commit receipt"));
}
}
let mut ordered: Vec<&HuginnCommitReceipt> = receipts.iter().collect();

View file

@ -330,10 +330,10 @@ impl<S: MindStore> Mind<S> {
for envelope in writes.iter().chain(std::iter::once(&receipt_envelope)) {
self.envelopes.entry(envelope.r#type.clone()).or_default().insert(envelope.key.clone(), envelope.clone());
}
if receipt.writes.iter().any(|write| write.document_type == HuginnPersonaEntry::TYPE && write.document_key == self.instance.0) {
if let Ok(held) = &mut self.persona_receipt {
*held = Some(receipt.receipt_id.clone());
}
if receipt.writes.iter().any(|write| write.document_type == HuginnPersonaEntry::TYPE && write.document_key == self.instance.0)
&& let Ok(held) = &mut self.persona_receipt
{
*held = Some(receipt.receipt_id.clone());
}
let Ok(image) = &mut self.image else { return };
let mut documents = Vec::new();
@ -349,11 +349,11 @@ impl<S: MindStore> Mind<S> {
Err(_) => faulted = true,
}
}
if faulted || image.advance(&AdmissionFacts::of(receipt), documents).is_err() {
if let Err(fault) = self.refresh() {
self.image = Err(fault.clone());
self.persona_receipt = Err(fault);
}
if (faulted || image.advance(&AdmissionFacts::of(receipt), documents).is_err())
&& let Err(fault) = self.refresh()
{
self.image = Err(fault.clone());
self.persona_receipt = Err(fault);
}
}
}

View file

@ -791,7 +791,7 @@ impl<S: MindStore> Mind<S> {
let role = CitationRole::from_name(&edge.role).ok_or_else(|| MindRefusal::Unavailable {
detail: format!("the evaluator returned an edge in role {:?}, which is not a citation role", edge.role),
})?;
typed.push(PipelineEdge { from: ref_of(&edge.from), role, to: ref_of(&edge.to) });
typed.push(PipelineEdge { from: ref_of(edge.from), role, to: ref_of(edge.to) });
}
Some(typed)
} else {