From ce3f0f33c2a7a8d34ae5fe28a495ffa2af5c0c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Hatcher?= Date: Sun, 23 Feb 2025 12:40:55 +0100 Subject: [PATCH] UPDATE: Update to Rust 2024 edition --- base/Cargo.toml | 2 +- base/examples/formulas_and_errors.rs | 2 +- base/examples/hello_world.rs | 2 +- base/src/diffs.rs | 2 +- base/src/expressions/lexer/ranges.rs | 8 +- base/src/expressions/parser/move_formula.rs | 2 +- .../expressions/parser/tests/test_general.rs | 2 +- .../parser/tests/test_issue_155.rs | 2 +- .../parser/tests/test_move_formula.rs | 2 +- .../expressions/parser/tests/test_ranges.rs | 2 +- .../parser/tests/test_stringify.rs | 2 +- base/src/expressions/parser/walk.rs | 2 +- base/src/formatter/format.rs | 8 +- base/src/formatter/test/test_general.rs | 2 +- base/src/functions/date_and_time.rs | 14 +-- .../transcendental/bessel_j0_y0.rs | 2 +- .../transcendental/bessel_j1_y1.rs | 2 +- .../transcendental/bessel_jn_yn.rs | 14 +-- .../engineering/transcendental/erf.rs | 6 +- base/src/functions/financial.rs | 18 ++- base/src/functions/information.rs | 6 +- base/src/functions/statistical.rs | 2 +- base/src/functions/subtotal.rs | 2 +- base/src/functions/text.rs | 6 +- base/src/lib.rs | 2 +- base/src/model.rs | 10 +- base/src/new_empty.rs | 4 +- base/src/number_format.rs | 2 +- base/src/test/test_actions.rs | 8 +- base/src/test/test_move_formula.rs | 104 ++++++++++-------- .../test/user_model/test_add_delete_sheets.rs | 2 +- .../test/user_model/test_autofill_columns.rs | 2 +- .../src/test/user_model/test_autofill_rows.rs | 2 +- base/src/test/user_model/test_border.rs | 2 +- base/src/test/user_model/test_clear_cells.rs | 2 +- base/src/test/user_model/test_column_style.rs | 2 +- .../test_delete_row_column_formatting.rs | 2 +- base/src/test/user_model/test_diff_queue.rs | 10 +- base/src/test/user_model/test_general.rs | 2 +- base/src/test/user_model/test_grid_lines.rs | 2 +- .../user_model/test_keyboard_navigation.rs | 2 +- .../test/user_model/test_on_area_selection.rs | 2 +- .../test_on_expand_selected_range.rs | 2 +- .../test/user_model/test_on_paste_styles.rs | 2 +- base/src/test/user_model/test_paste_csv.rs | 2 +- base/src/test/user_model/test_recursive.rs | 2 +- base/src/test/user_model/test_row_column.rs | 2 +- base/src/test/user_model/test_sheet_state.rs | 2 +- .../test/user_model/test_sheets_undo_redo.rs | 2 +- base/src/test/user_model/test_styles.rs | 2 +- .../src/test/user_model/test_to_from_bytes.rs | 2 +- base/src/test/user_model/test_undo_redo.rs | 2 +- base/src/test/user_model/test_view.rs | 2 +- base/src/test/user_model/test_window_size.rs | 2 +- base/src/test/user_model/util.rs | 2 +- base/src/user_model/border.rs | 2 +- base/src/utils.rs | 2 +- bindings/nodejs/Cargo.toml | 2 +- bindings/nodejs/rustfmt.toml | 2 +- bindings/nodejs/src/model.rs | 4 +- bindings/nodejs/src/user_model.rs | 4 +- bindings/python/Cargo.toml | 2 +- bindings/python/src/lib.rs | 2 +- bindings/wasm/Cargo.toml | 2 +- bindings/wasm/src/lib.rs | 4 +- generate_locale/Cargo.toml | 2 +- webapp/app.ironcalc.com/server/Cargo.toml | 2 +- xlsx/Cargo.toml | 2 +- xlsx/examples/hello_calc.rs | 2 +- xlsx/src/compare.rs | 2 +- xlsx/src/export/doc_props.rs | 4 +- xlsx/src/export/mod.rs | 2 +- xlsx/src/export/shared_strings.rs | 8 +- xlsx/src/export/test/test_export.rs | 12 +- xlsx/src/export/worksheets.rs | 2 +- xlsx/src/import/mod.rs | 4 +- xlsx/src/import/worksheets.rs | 4 +- 77 files changed, 186 insertions(+), 186 deletions(-) diff --git a/base/Cargo.toml b/base/Cargo.toml index 340e61d..1b84a8d 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -2,7 +2,7 @@ name = "ironcalc_base" version = "0.3.0" authors = ["Nicolás Hatcher "] -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 index 3e706b6..108446c 100644 --- 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> { 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 index 4199df5..7ca3f68 100644 --- 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> { let mut model = Model::new_empty("hello-world", "en", "UTC")?; diff --git a/base/src/diffs.rs b/base/src/diffs.rs index e02c115..be22a30 100644 --- 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 index b0f5788..b6e9681 100644 --- 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::() { 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 index 5453cb0..071eba3 100644 --- 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 index 6690892..1cb1dd7 100644 --- 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 index 6e8f7ba..00a3fe1 100644 --- 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 index 37fde78..f5d9851 100644 --- 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 index ec6766c..cbdb520 100644 --- 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 index 36dd3dc..98a15ed 100644 --- 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 index 746e379..63afd7d 100644 --- 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 index 6cbf495..54775bc 100644 --- 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 index 771a5ad..fbe93cc 100644 --- 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 index 8134b21..e4ef2f9 100644 --- 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 index 18c5c39..3f438dd 100644 --- 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 index c059339..74c7149 100644 --- 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 index 6217bbd..b31b6a4 100644 --- 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 index 9c56a4c..b6504ac 100644 --- 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 index 50f2fb9..c3cb461 100644 --- 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 index 44d847c..a3c805b 100644 --- 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 index 140e6b8..b84fb2d 100644 --- 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 index d0f9b86..f88af40 100644 --- 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, }, diff --git a/base/src/functions/text.rs b/base/src/functions/text.rs index 7538e9c..7ac4969 100644 --- a/base/src/functions/text.rs +++ b/base/src/functions/text.rs @@ -8,7 +8,7 @@ use crate::{ }; use super::{ - text_util::{substitute, text_after, text_before, Case}, + text_util::{Case, substitute, text_after, text_before}, util::from_wildcard_to_regex, }; @@ -368,7 +368,7 @@ impl Model { error: Error::VALUE, origin: cell, message: "Empty cell".to_string(), - } + }; } }; @@ -629,7 +629,7 @@ impl Model { error: Error::VALUE, origin: cell, message: "Expecting number".to_string(), - } + }; } error @ CalcResult::Error { .. } => return error, CalcResult::Range { .. } => { diff --git a/base/src/lib.rs b/base/src/lib.rs index 840a969..392c92a 100644 --- a/base/src/lib.rs +++ b/base/src/lib.rs @@ -57,8 +57,8 @@ mod test; #[cfg(test)] pub mod mock_time; -pub use model::get_milliseconds_since_epoch; pub use model::Model; +pub use model::get_milliseconds_since_epoch; pub use user_model::BorderArea; pub use user_model::ClipboardData; pub use user_model::UserModel; diff --git a/base/src/model.rs b/base/src/model.rs index f3ea71c..1594238 100644 --- a/base/src/model.rs +++ b/base/src/model.rs @@ -10,11 +10,11 @@ use crate::{ expressions::{ lexer::LexerMode, parser::{ - move_formula::{move_formula, MoveContext}, - stringify::{rename_defined_name_in_node, to_rc_format, to_string}, Node, Parser, + move_formula::{MoveContext, move_formula}, + stringify::{rename_defined_name_in_node, to_rc_format, to_string}, }, - token::{get_error_by_name, Error, OpCompare, OpProduct, OpSum, OpUnary}, + token::{Error, OpCompare, OpProduct, OpSum, OpUnary, get_error_by_name}, types::*, utils::{self, is_valid_column_number, is_valid_identifier, is_valid_row}, }, @@ -24,8 +24,8 @@ use crate::{ }, functions::util::compare_values, implicit_intersection::implicit_intersection, - language::{get_language, Language}, - locale::{get_locale, Currency, Locale}, + language::{Language, get_language}, + locale::{Currency, Locale, get_locale}, types::*, utils as common, }; diff --git a/base/src/new_empty.rs b/base/src/new_empty.rs index a313fe0..c1899e9 100644 --- a/base/src/new_empty.rs +++ b/base/src/new_empty.rs @@ -8,14 +8,14 @@ use crate::{ expressions::{ lexer::LexerMode, parser::{ - stringify::{rename_sheet_in_node, to_rc_format}, Parser, + stringify::{rename_sheet_in_node, to_rc_format}, }, types::CellReferenceRC, }, language::get_language, locale::get_locale, - model::{get_milliseconds_since_epoch, Model, ParsedDefinedName}, + model::{Model, ParsedDefinedName, get_milliseconds_since_epoch}, types::{ Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView, }, diff --git a/base/src/number_format.rs b/base/src/number_format.rs index 6fcf295..e8a758f 100644 --- a/base/src/number_format.rs +++ b/base/src/number_format.rs @@ -150,7 +150,7 @@ pub fn format_number(value: f64, format_code: &str, locale: &str) -> Formatted { text: "#ERROR!".to_owned(), color: None, error: Some("Invalid locale".to_string()), - } + }; } }; formatter::format::format_number(value, format_code, locale) diff --git a/base/src/test/test_actions.rs b/base/src/test/test_actions.rs index 5f89af6..b207344 100644 --- a/base/src/test/test_actions.rs +++ b/base/src/test/test_actions.rs @@ -206,9 +206,11 @@ fn test_delete_column_width() { let (sheet, column) = (0, 5); let normal_width = model.get_column_width(sheet, column).unwrap(); // Set the width of one column to 5 times the normal width - assert!(model - .set_column_width(sheet, column, normal_width * 5.0) - .is_ok()); + assert!( + model + .set_column_width(sheet, column, normal_width * 5.0) + .is_ok() + ); // delete it assert!(model.delete_columns(sheet, column, 1).is_ok()); diff --git a/base/src/test/test_move_formula.rs b/base/src/test/test_move_formula.rs index fd44bb8..a64d30d 100644 --- a/base/src/test/test_move_formula.rs +++ b/base/src/test/test_move_formula.rs @@ -179,52 +179,60 @@ fn test_move_formula_rectangle() { width: 2, height: 20, }; - assert!(model - .move_cell_value_to_area( - value, - &CellReferenceIndex { - sheet: 0, - column: 3, - row: 1, - }, - target, - area - ) - .is_err()); - assert!(model - .move_cell_value_to_area( - value, - &CellReferenceIndex { - sheet: 0, - column: 2, - row: 1, - }, - target, - area - ) - .is_ok()); - assert!(model - .move_cell_value_to_area( - value, - &CellReferenceIndex { - sheet: 0, - column: 1, - row: 20, - }, - target, - area - ) - .is_ok()); - assert!(model - .move_cell_value_to_area( - value, - &CellReferenceIndex { - sheet: 0, - column: 1, - row: 21, - }, - target, - area - ) - .is_err()); + assert!( + model + .move_cell_value_to_area( + value, + &CellReferenceIndex { + sheet: 0, + column: 3, + row: 1, + }, + target, + area + ) + .is_err() + ); + assert!( + model + .move_cell_value_to_area( + value, + &CellReferenceIndex { + sheet: 0, + column: 2, + row: 1, + }, + target, + area + ) + .is_ok() + ); + assert!( + model + .move_cell_value_to_area( + value, + &CellReferenceIndex { + sheet: 0, + column: 1, + row: 20, + }, + target, + area + ) + .is_ok() + ); + assert!( + model + .move_cell_value_to_area( + value, + &CellReferenceIndex { + sheet: 0, + column: 1, + row: 21, + }, + target, + area + ) + .is_err() + ); } diff --git a/base/src/test/user_model/test_add_delete_sheets.rs b/base/src/test/user_model/test_add_delete_sheets.rs index 21fa929..d0c82c0 100644 --- a/base/src/test/user_model/test_add_delete_sheets.rs +++ b/base/src/test/user_model/test_add_delete_sheets.rs @@ -1,6 +1,6 @@ #![allow(clippy::unwrap_used)] -use crate::{constants::DEFAULT_COLUMN_WIDTH, UserModel}; +use crate::{UserModel, constants::DEFAULT_COLUMN_WIDTH}; #[test] fn add_undo_redo() { diff --git a/base/src/test/user_model/test_autofill_columns.rs b/base/src/test/user_model/test_autofill_columns.rs index 871dadc..5e456b5 100644 --- a/base/src/test/user_model/test_autofill_columns.rs +++ b/base/src/test/user_model/test_autofill_columns.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] +use crate::UserModel; use crate::constants::{LAST_COLUMN, LAST_ROW}; use crate::expressions::types::Area; use crate::test::util::new_empty_model; -use crate::UserModel; #[test] fn basic_tests() { diff --git a/base/src/test/user_model/test_autofill_rows.rs b/base/src/test/user_model/test_autofill_rows.rs index d345dea..4d59040 100644 --- a/base/src/test/user_model/test_autofill_rows.rs +++ b/base/src/test/user_model/test_autofill_rows.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] +use crate::UserModel; use crate::constants::{LAST_COLUMN, LAST_ROW}; use crate::expressions::types::Area; use crate::test::util::new_empty_model; -use crate::UserModel; #[test] fn basic_tests() { diff --git a/base/src/test/user_model/test_border.rs b/base/src/test/user_model/test_border.rs index a37ff0a..560ac30 100644 --- a/base/src/test/user_model/test_border.rs +++ b/base/src/test/user_model/test_border.rs @@ -1,10 +1,10 @@ #![allow(clippy::unwrap_used)] use crate::{ + BorderArea, UserModel, constants::{LAST_COLUMN, LAST_ROW}, expressions::{types::Area, utils::number_to_column}, types::{Border, BorderItem, BorderStyle}, - BorderArea, UserModel, }; // checks there are no borders in the sheet diff --git a/base/src/test/user_model/test_clear_cells.rs b/base/src/test/user_model/test_clear_cells.rs index ef0685c..3a01ff4 100644 --- a/base/src/test/user_model/test_clear_cells.rs +++ b/base/src/test/user_model/test_clear_cells.rs @@ -1,6 +1,6 @@ #![allow(clippy::unwrap_used)] -use crate::{expressions::types::Area, UserModel}; +use crate::{UserModel, expressions::types::Area}; #[test] fn basic() { diff --git a/base/src/test/user_model/test_column_style.rs b/base/src/test/user_model/test_column_style.rs index 69d1b3f..8146d29 100644 --- a/base/src/test/user_model/test_column_style.rs +++ b/base/src/test/user_model/test_column_style.rs @@ -1,8 +1,8 @@ #![allow(clippy::unwrap_used)] +use crate::UserModel; use crate::constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN, LAST_ROW}; use crate::expressions::types::Area; -use crate::UserModel; #[test] fn column_width() { diff --git a/base/src/test/user_model/test_delete_row_column_formatting.rs b/base/src/test/user_model/test_delete_row_column_formatting.rs index 658356b..8154143 100644 --- a/base/src/test/user_model/test_delete_row_column_formatting.rs +++ b/base/src/test/user_model/test_delete_row_column_formatting.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN, LAST_ROW}, expressions::types::Area, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_diff_queue.rs b/base/src/test/user_model/test_diff_queue.rs index 8449cad..20e63f9 100644 --- a/base/src/test/user_model/test_diff_queue.rs +++ b/base/src/test/user_model/test_diff_queue.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT}, test::util::new_empty_model, - UserModel, }; #[test] @@ -157,7 +157,9 @@ fn new_sheet() { #[test] fn wrong_diffs_handled() { let mut model = UserModel::from_model(new_empty_model()); - assert!(model - .apply_external_diffs("Hello world".as_bytes()) - .is_err()); + assert!( + model + .apply_external_diffs("Hello world".as_bytes()) + .is_err() + ); } diff --git a/base/src/test/user_model/test_general.rs b/base/src/test/user_model/test_general.rs index dc4e60b..bfa058d 100644 --- a/base/src/test/user_model/test_general.rs +++ b/base/src/test/user_model/test_general.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] +use crate::UserModel; use crate::constants::{LAST_COLUMN, LAST_ROW}; use crate::test::util::new_empty_model; use crate::types::CellType; -use crate::UserModel; #[test] fn set_user_input_errors() { diff --git a/base/src/test/user_model/test_grid_lines.rs b/base/src/test/user_model/test_grid_lines.rs index 6656602..c90ebf5 100644 --- a/base/src/test/user_model/test_grid_lines.rs +++ b/base/src/test/user_model/test_grid_lines.rs @@ -1,7 +1,7 @@ #![allow(clippy::unwrap_used)] -use crate::test::util::new_empty_model; use crate::UserModel; +use crate::test::util::new_empty_model; #[test] fn basic_tests() { diff --git a/base/src/test/user_model/test_keyboard_navigation.rs b/base/src/test/user_model/test_keyboard_navigation.rs index c550baf..282368f 100644 --- a/base/src/test/user_model/test_keyboard_navigation.rs +++ b/base/src/test/user_model/test_keyboard_navigation.rs @@ -1,12 +1,12 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{ DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH, LAST_COLUMN, }, test::util::new_empty_model, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_on_area_selection.rs b/base/src/test/user_model/test_on_area_selection.rs index f4025b2..2367cba 100644 --- a/base/src/test/user_model/test_on_area_selection.rs +++ b/base/src/test/user_model/test_on_area_selection.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_WINDOW_WIDTH}, test::util::new_empty_model, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_on_expand_selected_range.rs b/base/src/test/user_model/test_on_expand_selected_range.rs index 46b93e5..0c66f02 100644 --- a/base/src/test/user_model/test_on_expand_selected_range.rs +++ b/base/src/test/user_model/test_on_expand_selected_range.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_WINDOW_WIDTH, LAST_COLUMN}, test::util::new_empty_model, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_on_paste_styles.rs b/base/src/test/user_model/test_on_paste_styles.rs index bb1b9d3..0ec3d46 100644 --- a/base/src/test/user_model/test_on_paste_styles.rs +++ b/base/src/test/user_model/test_on_paste_styles.rs @@ -1,8 +1,8 @@ #![allow(clippy::unwrap_used)] +use crate::UserModel; use crate::test::util::new_empty_model; use crate::types::Fill; -use crate::UserModel; #[test] fn simple_pasting() { diff --git a/base/src/test/user_model/test_paste_csv.rs b/base/src/test/user_model/test_paste_csv.rs index 0bef6cf..e1ec46b 100644 --- a/base/src/test/user_model/test_paste_csv.rs +++ b/base/src/test/user_model/test_paste_csv.rs @@ -1,6 +1,6 @@ #![allow(clippy::unwrap_used)] -use crate::{expressions::types::Area, UserModel}; +use crate::{UserModel, expressions::types::Area}; #[test] fn csv_paste() { diff --git a/base/src/test/user_model/test_recursive.rs b/base/src/test/user_model/test_recursive.rs index 0a4c8a8..a9e9e86 100644 --- a/base/src/test/user_model/test_recursive.rs +++ b/base/src/test/user_model/test_recursive.rs @@ -1,7 +1,7 @@ #![allow(clippy::unwrap_used)] use crate::{ - constants::LAST_ROW, expressions::types::Area, test::util::new_empty_model, UserModel, + UserModel, constants::LAST_ROW, expressions::types::Area, test::util::new_empty_model, }; #[test] diff --git a/base/src/test/user_model/test_row_column.rs b/base/src/test/user_model/test_row_column.rs index 4125a2e..c28aa64 100644 --- a/base/src/test/user_model/test_row_column.rs +++ b/base/src/test/user_model/test_row_column.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN}, test::util::new_empty_model, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_sheet_state.rs b/base/src/test/user_model/test_sheet_state.rs index bf9164f..2e61f67 100644 --- a/base/src/test/user_model/test_sheet_state.rs +++ b/base/src/test/user_model/test_sheet_state.rs @@ -1,7 +1,7 @@ #![allow(clippy::unwrap_used)] -use crate::test::util::new_empty_model; use crate::UserModel; +use crate::test::util::new_empty_model; #[test] fn basic_tests() { diff --git a/base/src/test/user_model/test_sheets_undo_redo.rs b/base/src/test/user_model/test_sheets_undo_redo.rs index a2720de..779e175 100644 --- a/base/src/test/user_model/test_sheets_undo_redo.rs +++ b/base/src/test/user_model/test_sheets_undo_redo.rs @@ -1,7 +1,7 @@ #![allow(clippy::unwrap_used)] -use crate::test::util::new_empty_model; use crate::UserModel; +use crate::test::util::new_empty_model; #[test] fn basic_undo_redo() { diff --git a/base/src/test/user_model/test_styles.rs b/base/src/test/user_model/test_styles.rs index 34267ab..9112a5f 100644 --- a/base/src/test/user_model/test_styles.rs +++ b/base/src/test/user_model/test_styles.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, expressions::types::Area, types::{Alignment, HorizontalAlignment, VerticalAlignment}, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_to_from_bytes.rs b/base/src/test/user_model/test_to_from_bytes.rs index 324b76c..8037385 100644 --- a/base/src/test/user_model/test_to_from_bytes.rs +++ b/base/src/test/user_model/test_to_from_bytes.rs @@ -1,6 +1,6 @@ #![allow(clippy::unwrap_used)] -use crate::{test::util::new_empty_model, UserModel}; +use crate::{UserModel, test::util::new_empty_model}; #[test] fn basic() { diff --git a/base/src/test/user_model/test_undo_redo.rs b/base/src/test/user_model/test_undo_redo.rs index 67b5de6..d7e30e0 100644 --- a/base/src/test/user_model/test_undo_redo.rs +++ b/base/src/test/user_model/test_undo_redo.rs @@ -1,6 +1,6 @@ #![allow(clippy::unwrap_used)] -use crate::{test::util::new_empty_model, UserModel}; +use crate::{UserModel, test::util::new_empty_model}; #[test] fn simple_undo_redo() { diff --git a/base/src/test/user_model/test_view.rs b/base/src/test/user_model/test_view.rs index 1ec665f..ef293b2 100644 --- a/base/src/test/user_model/test_view.rs +++ b/base/src/test/user_model/test_view.rs @@ -3,10 +3,10 @@ use std::collections::HashMap; use crate::{ + UserModel, constants::{LAST_COLUMN, LAST_ROW}, test::util::new_empty_model, user_model::SelectedView, - UserModel, }; #[test] diff --git a/base/src/test/user_model/test_window_size.rs b/base/src/test/user_model/test_window_size.rs index afe5da1..f6fd203 100644 --- a/base/src/test/user_model/test_window_size.rs +++ b/base/src/test/user_model/test_window_size.rs @@ -1,9 +1,9 @@ #![allow(clippy::unwrap_used)] use crate::{ + UserModel, constants::{DEFAULT_ROW_HEIGHT, DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH}, test::util::new_empty_model, - UserModel, }; #[test] diff --git a/base/src/test/user_model/util.rs b/base/src/test/user_model/util.rs index 877e7e6..8754bc6 100644 --- a/base/src/test/user_model/util.rs +++ b/base/src/test/user_model/util.rs @@ -1,6 +1,6 @@ #![allow(clippy::unwrap_used)] -use crate::{expressions::types::Area, types::Border, BorderArea, UserModel}; +use crate::{BorderArea, UserModel, expressions::types::Area, types::Border}; impl UserModel { pub fn _set_cell_border(&mut self, cell: &str, color: &str) { diff --git a/base/src/user_model/border.rs b/base/src/user_model/border.rs index d3d057a..1bf2478 100644 --- a/base/src/user_model/border.rs +++ b/base/src/user_model/border.rs @@ -4,7 +4,7 @@ use crate::{ }; use super::{ - border_utils::is_max_border, common::BorderType, history::Diff, BorderArea, UserModel, + BorderArea, UserModel, border_utils::is_max_border, common::BorderType, history::Diff, }; impl UserModel { diff --git a/base/src/utils.rs b/base/src/utils.rs index 5f15aae..385a6fd 100644 --- a/base/src/utils.rs +++ b/base/src/utils.rs @@ -156,7 +156,7 @@ mod tests { use super::*; use crate::language::get_language; - use crate::locale::{get_locale, Locale}; + use crate::locale::{Locale, get_locale}; fn get_test_locale() -> &'static Locale { #![allow(clippy::unwrap_used)] diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml index ac1f61b..2c3f9be 100644 --- a/bindings/nodejs/Cargo.toml +++ b/bindings/nodejs/Cargo.toml @@ -1,5 +1,5 @@ [package] -edition = "2021" +edition = "2024" name = "ironcalc_nodejs" version = "0.3.1" diff --git a/bindings/nodejs/rustfmt.toml b/bindings/nodejs/rustfmt.toml index cab5731..5a6e4ab 100644 --- a/bindings/nodejs/rustfmt.toml +++ b/bindings/nodejs/rustfmt.toml @@ -1,2 +1,2 @@ tab_spaces = 2 -edition = "2021" +edition = "2024" diff --git a/bindings/nodejs/src/model.rs b/bindings/nodejs/src/model.rs index d0c19a7..fcc264c 100644 --- a/bindings/nodejs/src/model.rs +++ b/bindings/nodejs/src/model.rs @@ -1,12 +1,12 @@ #![deny(clippy::all)] -use napi::{self, bindgen_prelude::*, JsUnknown, Result}; +use napi::{self, JsUnknown, Result, bindgen_prelude::*}; use serde::Serialize; use ironcalc::{ base::{ - types::{CellType, Style}, Model as BaseModel, + types::{CellType, Style}, }, error::XlsxError, export::{save_to_icalc, save_to_xlsx}, diff --git a/bindings/nodejs/src/user_model.rs b/bindings/nodejs/src/user_model.rs index b1ebcb9..5c09c57 100644 --- a/bindings/nodejs/src/user_model.rs +++ b/bindings/nodejs/src/user_model.rs @@ -2,12 +2,12 @@ use serde::Serialize; -use napi::{self, bindgen_prelude::*, JsUnknown, Result}; +use napi::{self, JsUnknown, Result, bindgen_prelude::*}; use ironcalc::base::{ + BorderArea, ClipboardData, UserModel as BaseModel, expressions::types::Area, types::{CellType, Style}, - BorderArea, ClipboardData, UserModel as BaseModel, }; #[derive(Serialize)] diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml index 3e0138a..f5fbb58 100644 --- a/bindings/python/Cargo.toml +++ b/bindings/python/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pyroncalc" version = "0.3.0" -edition = "2021" +edition = "2024" [lib] diff --git a/bindings/python/src/lib.rs b/bindings/python/src/lib.rs index 2c9b9fa..2e6d95a 100644 --- a/bindings/python/src/lib.rs +++ b/bindings/python/src/lib.rs @@ -2,8 +2,8 @@ use pyo3::exceptions::PyException; use pyo3::{create_exception, prelude::*, wrap_pyfunction}; use types::{PySheetProperty, PyStyle}; -use xlsx::base::types::Style; use xlsx::base::Model; +use xlsx::base::types::Style; use xlsx::export::{save_to_icalc, save_to_xlsx}; use xlsx::import; diff --git a/bindings/wasm/Cargo.toml b/bindings/wasm/Cargo.toml index 000ca65..05f1d36 100644 --- a/bindings/wasm/Cargo.toml +++ b/bindings/wasm/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Nicolas Hatcher "] description = "IronCalc Web bindings" license = "MIT/Apache-2.0" repository = "https://github.com/ironcalc/ironcalc" -edition = "2021" +edition = "2024" [lib] crate-type = ["cdylib"] diff --git a/bindings/wasm/src/lib.rs b/bindings/wasm/src/lib.rs index 5767a2e..17b2368 100644 --- a/bindings/wasm/src/lib.rs +++ b/bindings/wasm/src/lib.rs @@ -1,13 +1,13 @@ use serde::Serialize; use wasm_bindgen::{ - prelude::{wasm_bindgen, JsError}, JsValue, + prelude::{JsError, wasm_bindgen}, }; use ironcalc_base::{ + BorderArea, ClipboardData, UserModel as BaseModel, expressions::{lexer::util::get_tokens as tokenizer, types::Area, utils::number_to_column}, types::{CellType, Style}, - BorderArea, ClipboardData, UserModel as BaseModel, }; fn to_js_error(error: String) -> JsError { diff --git a/generate_locale/Cargo.toml b/generate_locale/Cargo.toml index 62cabe1..17a1fea 100644 --- a/generate_locale/Cargo.toml +++ b/generate_locale/Cargo.toml @@ -2,7 +2,7 @@ name = "generate_locale" version = "0.1.0" authors = ["Nicolás Hatcher "] -edition = "2021" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/webapp/app.ironcalc.com/server/Cargo.toml b/webapp/app.ironcalc.com/server/Cargo.toml index 5bbe291..5c91268 100644 --- a/webapp/app.ironcalc.com/server/Cargo.toml +++ b/webapp/app.ironcalc.com/server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ironcalc_server" version = "0.3.0" -edition = "2021" +edition = "2024" [dependencies] rocket = "0.5" diff --git a/xlsx/Cargo.toml b/xlsx/Cargo.toml index 3a3c0b2..6c187d5 100644 --- a/xlsx/Cargo.toml +++ b/xlsx/Cargo.toml @@ -2,7 +2,7 @@ name = "ironcalc" version = "0.3.0" authors = ["Nicolás Hatcher "] -edition = "2021" +edition = "2024" homepage = "https://www.ironcalc.com" repository = "https://github.com/ironcalc/ironcalc/" description = "The democratization of spreadsheets" diff --git a/xlsx/examples/hello_calc.rs b/xlsx/examples/hello_calc.rs index 085d2c8..4c5f498 100644 --- a/xlsx/examples/hello_calc.rs +++ b/xlsx/examples/hello_calc.rs @@ -1,5 +1,5 @@ use ironcalc::{ - base::{expressions::utils::number_to_column, Model}, + base::{Model, expressions::utils::number_to_column}, export::save_to_xlsx, }; diff --git a/xlsx/src/compare.rs b/xlsx/src/compare.rs index 09798a1..f1e339a 100644 --- a/xlsx/src/compare.rs +++ b/xlsx/src/compare.rs @@ -4,7 +4,7 @@ use std::path::Path; use ironcalc_base::cell::CellValue; use ironcalc_base::types::*; -use ironcalc_base::{expressions::utils::number_to_column, Model}; +use ironcalc_base::{Model, expressions::utils::number_to_column}; use crate::export::save_to_xlsx; use crate::import::load_from_xlsx; diff --git a/xlsx/src/export/doc_props.rs b/xlsx/src/export/doc_props.rs index ad6f2f5..a79c73d 100644 --- a/xlsx/src/export/doc_props.rs +++ b/xlsx/src/export/doc_props.rs @@ -1,6 +1,6 @@ use chrono::DateTime; use ironcalc_base::{ - new_empty::{APPLICATION, APP_VERSION, IRONCALC_USER}, + new_empty::{APP_VERSION, APPLICATION, IRONCALC_USER}, types::Workbook, }; @@ -42,7 +42,7 @@ pub(crate) fn get_core_xml(workbook: &Workbook, milliseconds: i64) -> Result String { for shared_string in &model.shared_strings { shared_strings.push(format!("{}", escape_xml(shared_string))); } - format!("{}\n\ + format!( + "{}\n\ \ {}\ - ", XML_DECLARATION, shared_strings.join("")) + ", + XML_DECLARATION, + shared_strings.join("") + ) } diff --git a/xlsx/src/export/test/test_export.rs b/xlsx/src/export/test/test_export.rs index 4bebc8d..de111d3 100644 --- a/xlsx/src/export/test/test_export.rs +++ b/xlsx/src/export/test/test_export.rs @@ -158,11 +158,13 @@ fn test_named_styles() { save_to_xlsx(&model, temp_file_name).unwrap(); let model = load_from_xlsx(temp_file_name, "en", "UTC").unwrap(); - assert!(model - .workbook - .styles - .get_style_index_by_name("bold & italics") - .is_ok()); + assert!( + model + .workbook + .styles + .get_style_index_by_name("bold & italics") + .is_ok() + ); fs::remove_file(temp_file_name).unwrap(); } diff --git a/xlsx/src/export/worksheets.rs b/xlsx/src/export/worksheets.rs index 7bf6fbe..c83db4e 100644 --- a/xlsx/src/export/worksheets.rs +++ b/xlsx/src/export/worksheets.rs @@ -22,7 +22,7 @@ use itertools::Itertools; use ironcalc_base::{ expressions::{ - parser::{stringify::to_excel_string, Node}, + parser::{Node, stringify::to_excel_string}, types::CellReferenceRC, utils::number_to_column, }, diff --git a/xlsx/src/import/mod.rs b/xlsx/src/import/mod.rs index 7ca509e..5b01217 100644 --- a/xlsx/src/import/mod.rs +++ b/xlsx/src/import/mod.rs @@ -16,8 +16,8 @@ use std::{ use roxmltree::Node; use ironcalc_base::{ - types::{Metadata, Workbook, WorkbookSettings, WorkbookView}, Model, + types::{Metadata, Workbook, WorkbookSettings, WorkbookView}, }; use crate::error::XlsxError; @@ -28,7 +28,7 @@ use metadata::load_metadata; use styles::load_styles; use util::get_attribute; use workbook::load_workbook; -use worksheets::{load_sheets, Relationship}; +use worksheets::{Relationship, load_sheets}; fn load_relationships( archive: &mut zip::ZipArchive, diff --git a/xlsx/src/import/worksheets.rs b/xlsx/src/import/worksheets.rs index 1c450b5..1e8b6ff 100644 --- a/xlsx/src/import/worksheets.rs +++ b/xlsx/src/import/worksheets.rs @@ -4,8 +4,8 @@ use std::{collections::HashMap, io::Read, num::ParseIntError}; use ironcalc_base::{ expressions::{ - parser::{stringify::to_rc_format, Parser}, - token::{get_error_by_english_name, Error}, + parser::{Parser, stringify::to_rc_format}, + token::{Error, get_error_by_english_name}, types::CellReferenceRC, utils::{column_to_number, parse_reference_a1}, },