build: Upgrade to Rust 2024

Author: jpmckinney

Cargo.toml

@@ -2,7 +2,7 @@
 name = "ocdscardinal"
 version = "0.0.7"
 authors = ["Open Contracting Partnership <[email protected]>"]
-edition = "2021"
+edition = "2024"
 description = "Measure red flags and procurement indicators using OCDS data."
 homepage = "https://github.com/open-contracting/cardinal-rs"
 repository = "https://github.com/open-contracting/cardinal-rs"

benches/main.rs

@@ -5,7 +5,7 @@ use std::fs::File;
 use std::io::BufReader;
 use std::time::Duration;
 
-use criterion::{black_box, Criterion};
+use criterion::{Criterion, black_box};
 use criterion_macro::criterion;
 
 use ocdscardinal::{Indicators, Settings};

build.rs

@@ -1,5 +1,3 @@
-#![feature(let_chains)]
-
 use std::cmp::Ordering;
 use std::collections::VecDeque;
 use std::env;

src/indicators/r003.rs

@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use chrono::DateTime;
 use serde_json::{Map, Value};
 
-use crate::indicators::{set_result, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, set_result};
 use crate::parse_pipe_separated_value;
 
 #[derive(Default)]

src/indicators/r018.rs

@@ -1,7 +1,7 @@
 use serde_json::{Map, Value};
 use std::collections::HashSet;
 
-use crate::indicators::{set_result, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, set_result};
 use crate::parse_pipe_separated_value_with_default;
 
 #[derive(Default)]

src/indicators/r024.rs

@@ -1,7 +1,7 @@
 use statrs::statistics::Data;
 use statrs::statistics::OrderStatistics;
 
-use crate::indicators::{set_meta, set_result, set_tenderer_map, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, set_meta, set_result, set_tenderer_map};
 
 #[derive(Default)]
 pub struct R024 {

src/indicators/r025.rs

@@ -4,7 +4,7 @@ use serde_json::{Map, Value};
 use statrs::statistics::Data;
 use statrs::statistics::OrderStatistics;
 
-use crate::indicators::{fraction, set_meta, set_result, sum, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, fraction, set_meta, set_result, sum};
 
 #[derive(Default)]
 pub struct R025 {

src/indicators/r028.rs

@@ -4,7 +4,7 @@ use itertools::chain;
 use ordered_float::OrderedFloat;
 use serde_json::{Map, Value};
 
-use crate::indicators::{reduce_map, set_result, set_tenderer_map, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, reduce_map, set_result, set_tenderer_map};
 use crate::parse_pipe_separated_value;
 
 #[derive(Default)]

src/indicators/r030.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use serde_json::{Map, Value};
 
-use crate::indicators::{reduce_map, set_result, set_tenderer_map, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, reduce_map, set_result, set_tenderer_map};
 
 #[derive(Default)]
 pub struct R030 {}
@@ -43,12 +43,12 @@ impl Calculate for R030 {
                     && date > end_date
                 {
                     for tenderer in tenderers {
-                        if let Some(Value::String(id)) = tenderer.get("id") {
-                            if award_supplier_ids.contains(id) {
-                                set_result!(item, OCID, ocid, R030, 1.0);
-                                set_result!(item, Tenderer, id, R030, 1.0);
-                                set_tenderer_map!(item, ocid_tenderer_r030, ocid.to_owned(), id.clone());
-                            }
+                        if let Some(Value::String(id)) = tenderer.get("id")
+                            && award_supplier_ids.contains(id)
+                        {
+                            set_result!(item, OCID, ocid, R030, 1.0);
+                            set_result!(item, Tenderer, id, R030, 1.0);
+                            set_tenderer_map!(item, ocid_tenderer_r030, ocid.to_owned(), id.clone());
                         }
                     }
                 }

src/indicators/r035.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 
 use serde_json::{Map, Value};
 
-use crate::indicators::{reduce_map, set_result, set_tenderer_map, Calculate, Indicators, Settings};
+use crate::indicators::{Calculate, Indicators, Settings, reduce_map, set_result, set_tenderer_map};
 
 #[derive(Default)]
 pub struct R035 {