sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Consolidate two structs

Browse Source
This commit is contained in:
Nicolas Hatcher
2024-02-20 15:19:05 +01:00
parent 55a963e360
commit ab2f1f10fc
26 changed files with 379 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base/src/test/util.rs
View File

@@ -1,6 +1,6 @@
#![allow(clippy::unwrap_used)]
use crate::calc_result::CellReference;
use crate::expressions::types::CellReferenceIndex;
use crate::model::Model;
use crate::types::Cell;
@@ -9,7 +9,7 @@ pub fn new_empty_model() -> Model {
}
impl Model {
fn _parse_reference(&self, cell: &str) -> CellReference {
fn _parse_reference(&self, cell: &str) -> CellReferenceIndex {
if cell.contains('!') {
self.parse_reference(cell).unwrap()
} else {
@@ -39,7 +39,7 @@ impl Model {
self.formatted_cell_value(sheet, row, column).unwrap()
}
pub fn _get_text(&self, cell: &str) -> String {
let CellReference { sheet, row, column } = self._parse_reference(cell);
let CellReferenceIndex { sheet, row, column } = self._parse_reference(cell);
self._get_text_at(sheet, row, column)
}
pub fn _get_cell(&self, cell: &str) -> &Cell {