fix: resolve Clippy warnings across all workspace targets

This commit is contained in:
2026-10-08 08:41:20 +01:00
parent 8381800fce
commit 61cf41f088
15 changed files with 72 additions and 82 deletions
@@ -193,8 +193,8 @@ fn stack_analysis_refunds_all_state_buffers_and_preserves_prior_ownership() {
b.charge(Q::RegistryBytes, 11).unwrap();
validate_registry_stacks(&code, &r, 1, &mut b).unwrap();
assert_eq!((b.used(Q::TemporaryBytes), b.used(Q::RegistryBytes)), (7, 11));
let mut limits = LoadLimits::default();
limits.temporary_bytes = 32; // Decode maps fit; CFG/state/work buffers cannot all fit.
// Decode maps fit; CFG/state/work buffers cannot all fit.
let limits = LoadLimits { temporary_bytes: 32, ..Default::default() };
let mut b = LoadBudget::new(limits);
b.charge(Q::TemporaryBytes, 7).unwrap();
let e = validate_registry_stacks(&code, &r, 1, &mut b).unwrap_err();
@@ -214,8 +214,7 @@ fn stack_analysis_straight_line_storage_is_bounded_by_blocks_not_instruction_fra
&code,
vec![FunctionDecl { local_slots: 300, max_stack_slots: 0, ..function(&code) }],
);
let mut limits = LoadLimits::default();
limits.temporary_bytes = 41_000;
let limits = LoadLimits { temporary_bytes: 41_000, ..Default::default() };
let mut b = LoadBudget::new(limits);
validate_registry_stacks(&code, &r, 1, &mut b).unwrap();
assert_eq!(b.used(Q::TemporaryBytes), 0);
@@ -336,8 +335,7 @@ fn stack_analysis_charges_work_for_loop_reprocessing_and_refunds_on_exhaustion()
);
let mut b = LoadBudget::new(Default::default());
validate_registry_stacks(&code, &r, 1, &mut b).unwrap();
let mut limits = LoadLimits::default();
limits.work = b.used(Q::Work) - 1;
let limits = LoadLimits { work: b.used(Q::Work) - 1, ..Default::default() };
let mut limited = LoadBudget::new(limits);
limited.charge(Q::TemporaryBytes, 7).unwrap();
let e = validate_registry_stacks(&code, &r, 1, &mut limited).unwrap_err();
@@ -433,8 +431,7 @@ fn local_bounds_use_derived_parameter_widths_and_u32_local_counts() {
let e = check(&bad, &r).unwrap_err();
assert_eq!((e.reason, e.member), (R::LocalSlot, Some(slot)));
}
let mut limits = LoadLimits::default();
limits.frame_slots = 74;
let limits = LoadLimits { frame_slots: 74, ..Default::default() };
let mut budget = LoadBudget::new(limits);
let e = validate_registry_instructions(&code, &r, 1, &mut budget).unwrap_err();
assert_eq!(e.reason, R::FrameSlots); // 2 parameters + 69 locals + 4 temporaries = 75.
@@ -506,8 +503,7 @@ fn scratch_is_refunded_per_function_and_preserves_prior_load_ownership() {
FunctionDecl { code_offset: 2, code_len: 2, ..function(&code) },
],
);
let mut limits = LoadLimits::default();
limits.temporary_bytes = 8;
let limits = LoadLimits { temporary_bytes: 8, ..Default::default() };
let mut budget = LoadBudget::new(limits);
budget.charge(Q::TemporaryBytes, 5).unwrap();
budget.charge(Q::RegistryBytes, 10).unwrap();
@@ -227,12 +227,12 @@ fn invalidate(
}
budget.work(working.len() * 2)?;
for fact in working {
if let Fact::Group { ty, part, origin: other } = *fact {
if origin == other {
let carrier = component(registry, ty, part, budget)?;
budget.work(1)?;
*fact = if carrier == ANY { Fact::Unknown } else { Fact::Carrier(carrier) };
}
if let Fact::Group { ty, part, origin: other } = *fact
&& origin == other
{
let carrier = component(registry, ty, part, budget)?;
budget.work(1)?;
*fact = if carrier == ANY { Fact::Unknown } else { Fact::Carrier(carrier) };
}
}
Ok(())
@@ -514,11 +514,11 @@ fn abi_mask(abi: AbiType) -> u8 {
fn invalidate_dynamic(values: &mut [Fact], origin: u64, budget: &mut LoadBudget) -> Result<(), E> {
budget.work(values.len() * 2)?;
for value in values {
if let Fact::Dynamic { part, origin: other } = *value {
if origin == other {
budget.work(1)?;
*value = if part == 0 { Fact::Carrier(I64 | NULL) } else { Fact::Unknown };
}
if let Fact::Dynamic { part, origin: other } = *value
&& origin == other
{
budget.work(1)?;
*value = if part == 0 { Fact::Carrier(I64 | NULL) } else { Fact::Unknown };
}
}
Ok(())
@@ -586,10 +586,10 @@ fn check_group(
let color = matches!(kind, TypeKind::Builtin(B::COLOR | B::PIXEL));
if color {
budget.work(1)?;
if let Fact::Int64(value) = values[width - 1] {
if u32::try_from(value).is_err() {
return Err(mismatch(width - 1).reference(IdDomain::Type, ty.0));
}
if let Fact::Int64(value) = values[width - 1]
&& u32::try_from(value).is_err()
{
return Err(mismatch(width - 1).reference(IdDomain::Type, ty.0));
}
}
Ok(())
@@ -295,8 +295,7 @@ fn type_analysis_is_metered_and_releases_scratch_on_success_and_failure() {
let mut full = LoadBudget::new(Default::default());
validate_registry_types(&code, &r, &[], &mut full).unwrap();
assert_eq!(full.used(Q::TemporaryBytes), 0);
let mut limits = LoadLimits::default();
limits.work = full.used(Q::Work) - 1;
let limits = LoadLimits { work: full.used(Q::Work) - 1, ..Default::default() };
let mut limited = LoadBudget::new(limits);
limited.charge(Q::TemporaryBytes, 7).unwrap();
let e = validate_registry_types(&code, &r, &[], &mut limited).unwrap_err();