ironcalc · nhatcher · Feb 23, 2025
diff --git a/base/Cargo.toml b/base/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ironcalc_base"
 version = "0.3.0"
 authors = ["Nicolás Hatcher <[email protected]>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://www.ironcalc.com"
 repository = "https://github.com/ironcalc/ironcalc/"
 description = "Open source spreadsheet engine"

diff --git a/base/examples/formulas_and_errors.rs b/base/examples/formulas_and_errors.rs
@@ -1,4 +1,4 @@
-use ironcalc_base::{types::CellType, Model};
+use ironcalc_base::{Model, types::CellType};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?;

diff --git a/base/examples/hello_world.rs b/base/examples/hello_world.rs
@@ -1,4 +1,4 @@
-use ironcalc_base::{cell::CellValue, Model};
+use ironcalc_base::{Model, cell::CellValue};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut model = Model::new_empty("hello-world", "en", "UTC")?;

diff --git a/base/src/diffs.rs b/base/src/diffs.rs
@@ -2,7 +2,7 @@ use crate::{
     expressions::{
         parser::{
             move_formula::ref_is_in_area,
-            stringify::{to_string, to_string_displaced, DisplaceData},
+            stringify::{DisplaceData, to_string, to_string_displaced},
             walk::forward_references,
         },
         types::{Area, CellReferenceIndex, CellReferenceRC},

diff --git a/base/src/expressions/lexer/ranges.rs b/base/src/expressions/lexer/ranges.rs
@@ -149,14 +149,16 @@ impl Lexer {
                         Ok(n) => n,
                         Err(_) => {
                             return Err(self
-                                .set_error(&format!("Failed parsing row {}", row_left), position))
+                                .set_error(&format!("Failed parsing row {}", row_left), position));
                         }
                     };
                     let row_right = match row_right.parse::<i32>() {
                         Ok(n) => n,
                         Err(_) => {
-                            return Err(self
-                                .set_error(&format!("Failed parsing row {}", row_right), position))
+                            return Err(self.set_error(
+                                &format!("Failed parsing row {}", row_right),
+                                position,
+                            ));
                         }
                     };
                     if row_left > LAST_ROW {

diff --git a/base/src/expressions/parser/move_formula.rs b/base/src/expressions/parser/move_formula.rs
@@ -1,6 +1,6 @@
 use super::{
-    stringify::{stringify_reference, DisplaceData},
     Node, Reference,
+    stringify::{DisplaceData, stringify_reference},
 };
 use crate::{
     constants::{LAST_COLUMN, LAST_ROW},

diff --git a/base/src/expressions/parser/tests/test_general.rs b/base/src/expressions/parser/tests/test_general.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 use crate::expressions::parser::stringify::{
-    to_rc_format, to_string, to_string_displaced, DisplaceData,
+    DisplaceData, to_rc_format, to_string, to_string_displaced,
 };
 use crate::expressions::parser::{Node, Parser};
 use crate::expressions::types::CellReferenceRC;

diff --git a/base/src/expressions/parser/tests/test_issue_155.rs b/base/src/expressions/parser/tests/test_issue_155.rs
@@ -2,8 +2,8 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::to_string;
 use crate::expressions::parser::Parser;
+use crate::expressions::parser::stringify::to_string;
 use crate::expressions::types::CellReferenceRC;
 
 #[test]

diff --git a/base/src/expressions/parser/tests/test_move_formula.rs b/base/src/expressions/parser/tests/test_move_formula.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use crate::expressions::parser::move_formula::{move_formula, MoveContext};
 use crate::expressions::parser::Parser;
+use crate::expressions::parser::move_formula::{MoveContext, move_formula};
 use crate::expressions::types::{Area, CellReferenceRC};
 
 #[test]

diff --git a/base/src/expressions/parser/tests/test_ranges.rs b/base/src/expressions/parser/tests/test_ranges.rs
@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 
-use crate::expressions::parser::stringify::{to_rc_format, to_string};
 use crate::expressions::parser::Parser;
+use crate::expressions::parser::stringify::{to_rc_format, to_string};
 use crate::expressions::types::CellReferenceRC;
 
 struct Formula<'a> {

diff --git a/base/src/expressions/parser/tests/test_stringify.rs b/base/src/expressions/parser/tests/test_stringify.rs
@@ -2,8 +2,8 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::to_string;
 use crate::expressions::parser::Parser;
+use crate::expressions::parser::stringify::to_string;
 use crate::expressions::types::CellReferenceRC;
 
 #[test]

diff --git a/base/src/expressions/parser/walk.rs b/base/src/expressions/parser/walk.rs
@@ -1,4 +1,4 @@
-use super::{move_formula::ref_is_in_area, Node};
+use super::{Node, move_formula::ref_is_in_area};
 
 use crate::expressions::types::{Area, CellReferenceIndex};
 

diff --git a/base/src/formatter/format.rs b/base/src/formatter/format.rs
@@ -161,7 +161,7 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                         text: "#VALUE!".to_owned(),
                         color: None,
                         error: Some(e),
-                    }
+                    };
                 }
             };
             for token in tokens {
@@ -391,11 +391,7 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                             if l_exp <= p.exponent_digit_count {
                                 if !(number_index < 0 && digit.kind == '#') {
                                     let c = if number_index < 0 {
-                                        if digit.kind == '?' {
-                                            ' '
-                                        } else {
-                                            '0'
-                                        }
+                                        if digit.kind == '?' { ' ' } else { '0' }
                                     } else {
                                         exponent_part[number_index as usize]
                                     };

diff --git a/base/src/formatter/test/test_general.rs b/base/src/formatter/test/test_general.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     formatter::format::format_number,
-    locale::{get_locale, Locale},
+    locale::{Locale, get_locale},
 };
 
 fn get_default_locale() -> &'static Locale {

diff --git a/base/src/functions/date_and_time.rs b/base/src/functions/date_and_time.rs
@@ -31,7 +31,7 @@ impl Model {
                     error: Error::NUM,
                     origin: cell,
                     message: "Out of range parameters for date".to_string(),
-                }
+                };
             }
         };
         let day = date.day() as f64;
@@ -54,7 +54,7 @@ impl Model {
                     error: Error::NUM,
                     origin: cell,
                     message: "Out of range parameters for date".to_string(),
-                }
+                };
             }
         };
         let month = date.month() as f64;
@@ -87,7 +87,7 @@ impl Model {
                     error: Error::NUM,
                     origin: cell,
                     message: "Out of range parameters for date".to_string(),
-                }
+                };
             }
         };
         if serial_number > MAXIMUM_DATE_SERIAL_NUMBER as i64 {
@@ -192,7 +192,7 @@ impl Model {
                     error: Error::NUM,
                     origin: cell,
                     message: "Out of range parameters for date".to_string(),
-                }
+                };
             }
         };
         let year = date.year() as f64;
@@ -216,7 +216,7 @@ impl Model {
                     error: Error::NUM,
                     origin: cell,
                     message: "Out of range parameters for date".to_string(),
-                }
+                };
             }
         };
 
@@ -266,7 +266,7 @@ impl Model {
                     error: Error::ERROR,
                     origin: cell,
                     message: "Invalid date".to_string(),
-                }
+                };
             }
         };
         // 693_594 is computed as:
@@ -296,7 +296,7 @@ impl Model {
                     error: Error::ERROR,
                     origin: cell,
                     message: "Invalid date".to_string(),
-                }
+                };
             }
         };
         // 693_594 is computed as:

diff --git a/base/src/functions/engineering/transcendental/bessel_j0_y0.rs b/base/src/functions/engineering/transcendental/bessel_j0_y0.rs
@@ -57,7 +57,7 @@
 
 use std::f64::consts::FRAC_2_PI;
 
-use super::bessel_util::{high_word, split_words, FRAC_2_SQRT_PI, HUGE};
+use super::bessel_util::{FRAC_2_SQRT_PI, HUGE, high_word, split_words};
 
 // R0/S0 on [0, 2.00]
 const R02: f64 = 1.562_499_999_999_999_5e-2; // 0x3F8FFFFF, 0xFFFFFFFD

diff --git a/base/src/functions/engineering/transcendental/bessel_j1_y1.rs b/base/src/functions/engineering/transcendental/bessel_j1_y1.rs
@@ -56,7 +56,7 @@
 
 use std::f64::consts::FRAC_2_PI;
 
-use super::bessel_util::{high_word, split_words, FRAC_2_SQRT_PI, HUGE};
+use super::bessel_util::{FRAC_2_SQRT_PI, HUGE, high_word, split_words};
 
 // R0/S0 on [0,2]
 const R00: f64 = -6.25e-2; // 0xBFB00000, 0x00000000

diff --git a/base/src/functions/engineering/transcendental/bessel_jn_yn.rs b/base/src/functions/engineering/transcendental/bessel_jn_yn.rs
@@ -40,7 +40,7 @@
 use super::{
     bessel_j0_y0::{j0, y0},
     bessel_j1_y1::{j1, y1},
-    bessel_util::{split_words, FRAC_2_SQRT_PI},
+    bessel_util::{FRAC_2_SQRT_PI, split_words},
 };
 
 // Special cases are:
@@ -232,11 +232,7 @@ pub(crate) fn jn(n: i32, x: f64) -> f64 {
             }
         }
     };
-    if sign == 1 {
-        -b
-    } else {
-        b
-    }
+    if sign == 1 { -b } else { b }
 }
 
 // Yn returns the order-n Bessel function of the second kind.
@@ -321,9 +317,5 @@ pub(crate) fn yn(n: i32, x: f64) -> f64 {
         }
         b
     };
-    if sign > 0 {
-        b
-    } else {
-        -b
-    }
+    if sign > 0 { b } else { -b }
 }
diff --git a/base/src/functions/engineering/transcendental/erf.rs b/base/src/functions/engineering/transcendental/erf.rs
@@ -45,9 +45,5 @@ pub(crate) fn erf(x: f64) -> f64 {
     }
 
     let res = t * f64::exp(-x_abs * x_abs + 0.5 * (cof[0] + ty * d) - dd);
-    if x < 0.0 {
-        res - 1.0
-    } else {
-        1.0 - res
-    }
+    if x < 0.0 { res - 1.0 } else { 1.0 - res }
 }
diff --git a/base/src/functions/financial.rs b/base/src/functions/financial.rs
@@ -698,7 +698,7 @@ impl Model {
                     error: error.0,
                     origin: cell,
                     message: error.1,
-                }
+                };
             }
         };
         CalcResult::Number(ipmt)
@@ -762,7 +762,7 @@ impl Model {
                     error: error.0,
                     origin: cell,
                     message: error.1,
-                }
+                };
             }
         };
         CalcResult::Number(ppmt)
@@ -1075,7 +1075,7 @@ impl Model {
                         error,
                         origin: cell,
                         message,
-                    }
+                    };
                 }
             }
         };
@@ -1096,7 +1096,7 @@ impl Model {
                         error,
                         origin: cell,
                         message,
-                    }
+                    };
                 }
             }
         };
@@ -1634,7 +1634,7 @@ impl Model {
                         error: error.0,
                         origin: cell,
                         message: error.1,
-                    }
+                    };
                 }
             }
         }
@@ -1702,7 +1702,7 @@ impl Model {
                         error: error.0,
                         origin: cell,
                         message: error.1,
-                    }
+                    };
                 }
             }
         }
@@ -1750,11 +1750,7 @@ impl Model {
             rate = 1.0
         };
         let value = if rate == 1.0 {
-            if period == 1.0 {
-                cost
-            } else {
-                0.0
-            }
+            if period == 1.0 { cost } else { 0.0 }
         } else {
             cost * (1.0 - rate).powf(period - 1.0)
         };

diff --git a/base/src/functions/information.rs b/base/src/functions/information.rs
@@ -257,10 +257,10 @@ impl Model {
                 {
                     match defined_name {
                         ParsedDefinedName::CellReference(reference) => {
-                            return CalcResult::Number(reference.sheet as f64 + 1.0)
+                            return CalcResult::Number(reference.sheet as f64 + 1.0);
                         }
                         ParsedDefinedName::RangeReference(range) => {
-                            return CalcResult::Number(range.left.sheet as f64 + 1.0)
+                            return CalcResult::Number(range.left.sheet as f64 + 1.0);
                         }
                         ParsedDefinedName::InvalidDefinedNameFormula => {
                             return CalcResult::Error {
@@ -296,7 +296,7 @@ impl Model {
                     error: Error::NAME,
                     origin: cell,
                     message: format!("Name not found: {name}"),
-                }
+                };
             }
             arg => {
                 // Now it should be the name of a sheet

diff --git a/base/src/functions/statistical.rs b/base/src/functions/statistical.rs
@@ -388,7 +388,7 @@ impl Model {
                     Error::ERROR,
                     cell,
                     format!("Invalid worksheet index: '{}'", first_range.left.sheet),
-                )
+                );
             }
         };
         let max_row = dimension.max_row;

diff --git a/base/src/functions/subtotal.rs b/base/src/functions/subtotal.rs
@@ -1,7 +1,7 @@
 use crate::{
     calc_result::CalcResult,
     expressions::{
-        parser::{parse_range, Node},
+        parser::{Node, parse_range},
         token::Error,
         types::CellReferenceIndex,
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -388,7 +388,7 @@ impl Model { @@
                         Error::ERROR,
                         cell,
                         format!("Invalid worksheet index: '{}'", first_range.left.sheet),
-                    )
+                    );
                 }
             };
             let max_row = dimension.max_row;
@@ Expand Down @@