From 6b8aa1b42aaea617ece655e5890c3e71b09fc288 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 13 Jul 2026 10:45:07 +0100 Subject: [PATCH] Fix clippy errors --- src/asset.rs | 6 +++--- src/asset/capacity.rs | 2 +- src/input/agent/search_space.rs | 2 +- src/input/process/availability.rs | 2 +- src/process.rs | 6 +++--- src/simulation/investment.rs | 10 +++++----- src/simulation/investment/appraisal.rs | 4 ++-- src/simulation/market.rs | 2 +- tests/regression.rs | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/asset.rs b/src/asset.rs index 860e47779..f591a7968 100644 --- a/src/asset.rs +++ b/src/asset.rs @@ -260,7 +260,7 @@ impl Asset { format!( "No process availabilities supplied for process {} in region {} in year {}. \ You should update process_availabilities.csv.", - &process.id, region_id, commission_year + process.id, region_id, commission_year ) })? .clone(); @@ -271,7 +271,7 @@ impl Asset { format!( "No commodity flows supplied for process {} in region {} in year {}. \ You should update process_flows.csv.", - &process.id, region_id, commission_year + process.id, region_id, commission_year ) })? .clone(); @@ -282,7 +282,7 @@ impl Asset { format!( "No process parameters supplied for process {} in region {} in year {}. \ You should update process_parameters.csv.", - &process.id, region_id, commission_year + process.id, region_id, commission_year ) })? .clone(); diff --git a/src/asset/capacity.rs b/src/asset/capacity.rs index 6d79e0c50..0ee9475f0 100644 --- a/src/asset/capacity.rs +++ b/src/asset/capacity.rs @@ -291,7 +291,7 @@ mod tests { #[case] right: AssetCapacity, ) { assert_eq!(left.partial_cmp(&right), None); - assert!(left != right); + assert_ne!(left, right); } #[rstest] diff --git a/src/input/agent/search_space.rs b/src/input/agent/search_space.rs index 70d6229be..44236266d 100644 --- a/src/input/agent/search_space.rs +++ b/src/input/agent/search_space.rs @@ -118,7 +118,7 @@ where producers.iter().any(|producer| producer.id == process.id), "Process '{}' does not produce commodity '{commodity_id}' in region \ '{region_id}' in year {year}", - &process.id + process.id ); } diff --git a/src/input/process/availability.rs b/src/input/process/availability.rs index d556d5e0c..cf10ceb2b 100644 --- a/src/input/process/availability.rs +++ b/src/input/process/availability.rs @@ -35,7 +35,7 @@ impl ProcessAvailabilityRaw { fn to_bounds(&self, length: Year) -> Result> { // Parse availability_range string let availability_range = parse_range(&self.limits, Dimensionless(0.0)..=Dimensionless(1.0)) - .with_context(|| format!("Could not parse availabilities range: {}", &self.limits))?; + .with_context(|| format!("Could not parse availabilities range: {}", self.limits))?; // Convert to bounds based on fraction of the year covered let ts_frac = length / Year(1.0); diff --git a/src/process.rs b/src/process.rs index 044efe251..9495e50ff 100644 --- a/src/process.rs +++ b/src/process.rs @@ -1021,9 +1021,9 @@ mod tests { cost: MoneyPerFlow(0.0), }; - assert!(flow_in.direction() == FlowDirection::Input); - assert!(flow_out.direction() == FlowDirection::Output); - assert!(flow_zero.direction() == FlowDirection::Zero); + assert_eq!(flow_in.direction(), FlowDirection::Input); + assert_eq!(flow_out.direction(), FlowDirection::Output); + assert_eq!(flow_zero.direction(), FlowDirection::Zero); } #[rstest] diff --git a/src/simulation/investment.rs b/src/simulation/investment.rs index cb9e02c64..620061fa5 100644 --- a/src/simulation/investment.rs +++ b/src/simulation/investment.rs @@ -348,7 +348,7 @@ pub fn select_best_assets( !opt_assets.is_empty(), "Failed to meet demand for commodity '{}' in region '{}' with provided investment \ options. This may be due to overly restrictive process investment constraints.", - &commodity.id, + commodity.id, region_id ); @@ -406,7 +406,7 @@ pub fn select_best_assets( // Save appraisal results writer.write_appraisal_debug_info( year, - &format!("{} {} round {}", &commodity.id, &agent.id, round), + &format!("{} {} round {}", commodity.id, agent.id, round), &outputs_for_opts, &demand, )?; @@ -422,7 +422,7 @@ pub fn select_best_assets( "Investment appraisal completed with unmet demand for commodity '{}', region '{}', \ year '{}', agent '{}'. {} non-feasible investments were not considered. \ This unmet demand may still be satisfied during the full system dispatch.", - &commodity.id, region_id, year, agent.id, num_nonfeasible + commodity.id, region_id, year, agent.id, num_nonfeasible ); break; } @@ -435,8 +435,8 @@ pub fn select_best_assets( // Log the selected asset debug!( "Selected {} asset '{}' (capacity: {})", - &best_output.asset.state(), - &best_output.asset.process_id(), + best_output.asset.state(), + best_output.asset.process_id(), best_output.asset.capacity().total_capacity() ); diff --git a/src/simulation/investment/appraisal.rs b/src/simulation/investment/appraisal.rs index 74b0ddd3f..593a03228 100644 --- a/src/simulation/investment/appraisal.rs +++ b/src/simulation/investment/appraisal.rs @@ -653,9 +653,9 @@ mod tests { // Commissioned assets should be prioritised first assert!(outputs[0].asset.is_commissioned()); - assert!(outputs[0].asset.commission_year() == 2020); + assert_eq!(outputs[0].asset.commission_year(), 2020); assert!(outputs[1].asset.is_commissioned()); - assert!(outputs[1].asset.commission_year() == 2015); + assert_eq!(outputs[1].asset.commission_year(), 2015); // Non-commissioned assets should come after assert!(!outputs[2].asset.is_commissioned()); diff --git a/src/simulation/market.rs b/src/simulation/market.rs index d4e4ef2f5..806a273f5 100644 --- a/src/simulation/market.rs +++ b/src/simulation/market.rs @@ -168,7 +168,7 @@ pub fn select_assets_for_single_market( { debug!( "Running asset selection for agent '{}' in market '{}|{}'", - &agent.id, commodity_id, region_id + agent.id, commodity_id, region_id ); // Get demand portion for this market for this agent in this year diff --git a/tests/regression.rs b/tests/regression.rs index a1bb73941..e7badd8e0 100644 --- a/tests/regression.rs +++ b/tests/regression.rs @@ -81,7 +81,7 @@ fn compare_output_dirs(cur_output_dir1: &Path, test_data_dir: &Path, debug_model let file_names2 = get_csv_file_names(test_data_dir); // Check that output files haven't been added/removed - assert!(file_names1 == file_names2); + assert_eq!(file_names1, file_names2); let mut errors = Vec::new(); for file_name in file_names1 {