diff --git a/crates/engine/src/cf.rs b/crates/engine/src/cf.rs index 8c5c435eb..c7fdc44b9 100644 --- a/crates/engine/src/cf.rs +++ b/crates/engine/src/cf.rs @@ -5,7 +5,7 @@ use std::collections::HashMap; use gridcraft_core::{CellRef, RangeRef, Value, compare}; use gridcraft_model::{ - Cell, CfOperator, CfRule, CfValueKind, Color, CondFormat, Fill, Formula, PatternType, Sheet, Style, Underline, Workbook, default_icon_thresholds, + CfOperator, CfRule, CfValueKind, Color, CondFormat, PatternType, Sheet, Style, Underline, Workbook, default_icon_thresholds, }; /// The conditional look of one cell. diff --git a/crates/engine/src/cmd/sheet.rs b/crates/engine/src/cmd/sheet.rs index a220f19c0..dbab19ff7 100644 --- a/crates/engine/src/cmd/sheet.rs +++ b/crates/engine/src/cmd/sheet.rs @@ -8,7 +8,7 @@ use gridcraft_model::{Anchor, AnchorMode, Sheet, Visibility}; use serde_json::{Value as Json, json}; use super::{ - CommandSpec, Ctx, EngineError, PROTECTED, Result, Session, bad, bool_param, cell_param_on, cmd, commit, edit, has_clipboard, has_doc, ok, + CommandSpec, Ctx, EngineError, PROTECTED, Result, Session, bad, bool_param, cell_param_on, cmd, edit, has_clipboard, has_doc, ok, parse_lines, str_param, target_range, target_sheet, u32_param, }; diff --git a/crates/engine/src/pivot.rs b/crates/engine/src/pivot.rs index 1329d31c9..c4a40b9f6 100644 --- a/crates/engine/src/pivot.rs +++ b/crates/engine/src/pivot.rs @@ -13,7 +13,7 @@ pub use gridcraft_core::quote_sheet; use gridcraft_core::{CellError, CellRef, MAX_COLS, MAX_ROWS, RangeRef, Value, split_sheet}; use gridcraft_model::{ BorderLine, BorderStyle, Cell, Chart, Color, Fill, HAlign, NumFmt, PivotDateGroup, PivotField, PivotFilter, PivotFunc, PivotLayout, PivotShowAs, - PivotSort, PivotTable, PivotValue, Series, Style, StyleId, Theme, Workbook, + PivotSort, PivotTable, PivotValue, Series, Style, StyleId, Workbook, }; use crate::pivot_calc::CalcSet; diff --git a/crates/engine/src/tables.rs b/crates/engine/src/tables.rs index 48e77d01c..46b5c3373 100644 --- a/crates/engine/src/tables.rs +++ b/crates/engine/src/tables.rs @@ -2,7 +2,7 @@ //! `TableStyleLight1…21 / Medium1…28 / Dark1…11` names so files round-trip). use gridcraft_core::{CellRef, RangeRef}; -use gridcraft_model::{BorderLine, BorderStyle, Cell, Color, Fill, Formula, PatternType, Style, Table, Theme, Workbook}; +use gridcraft_model::{BorderLine, BorderStyle, Cell, Color, Fill, Formula, PatternType, Style, Table, Workbook}; /// (family, number) from a style name, e.g. `TableStyleMedium2` → ("Medium", 2). pub fn parse_style_name(name: &str) -> (&'static str, u32) { diff --git a/crates/ui-egui/src/backstage.rs b/crates/ui-egui/src/backstage.rs index 7c032d72e..7ea258ce7 100644 --- a/crates/ui-egui/src/backstage.rs +++ b/crates/ui-egui/src/backstage.rs @@ -353,7 +353,7 @@ fn new_tiles(app: &mut SheetApp, ui: &mut Ui, out: &mut Outcome) { fn split_path(path: &str) -> (String, String) { let p = std::path::Path::new(path); let name = p.file_name().and_then(std::ffi::OsStr::to_str).unwrap_or(path).to_string(); - let folder = p.parent().and_then(std::ffi::OsStr::to_str).unwrap_or("").to_string(); + let folder = p.parent().and_then(std::path::Path::to_str).unwrap_or("").to_string(); (name, folder) }