chore(deps): bump the cargo-dependencies group across 1 directory with 6 updates

Bumps the cargo-dependencies group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [log](https://github.com/rust-lang/log) | `0.4.34` | `0.4.35` | | [quick-xml](https://github.com/tafia/quick-xml) | `0.41.0` | `0.42.0` | | [zip](https://github.com/zip-rs/zip2) | `3.0.0` | `9.1.0` | | [ratex-types](https://github.com/erweixin/RaTeX) | `0.1.14` | `0.1.15` | | [ratex-font](https://github.com/erweixin/RaTeX) | `0.1.14` | `0.1.15` | | [skrifa](https://github.com/googlefonts/fontations) | `0.44.0` | `0.48.0` | Updates `log` from 0.4.34 to 0.4.35 - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-lang/log/compare/0.4.34...v0.4.35) Updates `quick-xml` from 0.41.0 to 0.42.0 - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](https://github.com/tafia/quick-xml/compare/v0.41.0...v0.42.0) Updates `zip` from 3.0.0 to 9.1.0 - [Release notes](https://github.com/zip-rs/zip2/releases) - [Changelog](https://github.com/zip-rs/zip2/blob/master/CHANGELOG.md) - [Commits](https://github.com/zip-rs/zip2/compare/v3.0.0...v9.1.0) Updates `ratex-types` from 0.1.14 to 0.1.15 - [Release notes](https://github.com/erweixin/RaTeX/releases) - [Changelog](https://github.com/erweixin/RaTeX/blob/main/CHANGELOG.md) - [Commits](https://github.com/erweixin/RaTeX/compare/v0.1.14...v0.1.15) Updates `ratex-font` from 0.1.14 to 0.1.15 - [Release notes](https://github.com/erweixin/RaTeX/releases) - [Changelog](https://github.com/erweixin/RaTeX/blob/main/CHANGELOG.md) - [Commits](https://github.com/erweixin/RaTeX/compare/v0.1.14...v0.1.15) Updates `skrifa` from 0.44.0 to 0.48.0 - [Release notes](https://github.com/googlefonts/fontations/releases) - [Changelog](https://github.com/googlefonts/fontations/blob/main/docs/RELEASE.md) - [Commits](https://github.com/googlefonts/fontations/compare/skrifa-v0.44.0...skrifa-v0.48.0) --- updated-dependencies: - dependency-name: log dependency-version: 0.4.35 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: quick-xml dependency-version: 0.42.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: ratex-font dependency-version: 0.1.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: ratex-types dependency-version: 0.1.15 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: skrifa dependency-version: 0.48.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: zip dependency-version: 9.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
2026-11-03 08:51:30 -06:00 · 2026-11-03 11:09:38 +00:00
3 changed files with 62 additions and 118 deletions
@@ -195,15 +195,6 @@ version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"

-[[package]]
-name = "arbitrary"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bc62ac97cc33321f50863d514c3bc38a453947a8f9e781137e47c7401020aed"
-dependencies = [
- "derive_arbitrary",
-]
-
 [[package]]
 name = "arboard"
 version = "3.7.0"
@@ -220,7 +211,7 @@ dependencies = [
 "objc2-foundation 0.3.2",
 "parking_lot",
 "percent-encoding",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 "wl-clipboard-rs",
 "x11rb",
 ]
@@ -963,7 +954,7 @@ dependencies = [
 "objc2 0.6.5",
 "objc2-app-kit 0.3.2",
 "objc2-foundation 0.3.2",
- "skrifa",
+ "skrifa 0.44.0",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
@@ -992,7 +983,7 @@ dependencies = [
 "verifysign",
 "winreg",
 "winsafe",
- "zip 9.1.0",
+ "zip",
 ]

 [[package]]
@@ -1130,17 +1121,6 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"

-[[package]]
-name = "derive_arbitrary"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b034bd7d5f032402a2479444dcc6f74e36a03f31854d41680fb240ef682a1ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 3.0.6",
-]
-
 [[package]]
 name = "dify"
 version = "0.8.0"
@@ -1451,7 +1431,7 @@ dependencies = [
 "parking_lot",
 "profiling",
 "self_cell",
- "skrifa",
+ "skrifa 0.44.0",
 "smallvec",
 "unicode-bidi",
 "unicode-general-category",
@@ -1478,7 +1458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -1657,9 +1637,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"

 [[package]]
 name = "font-types"
-version = "0.12.6"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c92d9081c7ab3bd83ef1eecdfad090f3d966e3ce74106779664114cfe1a6274"
+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"
 dependencies = [
 "bytemuck",
 ]
@@ -1870,7 +1850,7 @@ dependencies = [
 "hashbrown 0.17.1",
 "log",
 "peniko",
- "skrifa",
+ "skrifa 0.44.0",
 "smallvec",
 "vello_common",
 ]
@@ -2024,9 +2004,9 @@ dependencies = [
 "gridcraft-engine",
 "gridcraft-mcp",
 "log",
- "quick-xml 0.41.0",
+ "quick-xml 0.42.0",
 "serde_json",
- "zip 3.0.0",
+ "zip",
 ]

 [[package]]
@@ -2060,7 +2040,7 @@ dependencies = [
 "serde_json",
 "thiserror 2.0.21",
 "web-time",
- "zip 3.0.0",
+ "zip",
 ]

 [[package]]
@@ -2140,7 +2120,7 @@ dependencies = [
 "log",
 "serde",
 "serde_json",
- "skrifa",
+ "skrifa 0.48.0",
 "sys-locale",
 "toml",
 "web-sys",
@@ -2175,11 +2155,11 @@ dependencies = [
 "gridcraft-functions",
 "gridcraft-math",
 "gridcraft-model",
- "quick-xml 0.41.0",
+ "quick-xml 0.42.0",
 "sha1 0.11.0",
 "sha2 0.11.1",
 "thiserror 2.0.21",
- "zip 3.0.0",
+ "zip",
 ]

 [[package]]
@@ -2230,7 +2210,7 @@ checksum = "c03d949a14aa089bbb282f7dd76a498a7f684428e4257202efc119ec010376f9"
 dependencies = [
 "bitflags 2.13.2",
 "bytemuck",
- "read-fonts",
+ "read-fonts 0.41.0",
 "smallvec",
 ]

@@ -2900,9 +2880,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
+checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c"

 [[package]]
 name = "lru-slab"
@@ -3507,7 +3487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -3963,7 +3943,7 @@ dependencies = [
 "once_cell",
 "socket2",
 "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -4036,9 +4016,9 @@ checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"

 [[package]]
 name = "ratex-font"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a7b73531dabe934a3e725ed5c90d18dacf43778b7a208381390943a9a8c24db"
+checksum = "e4373503a1068c9f7d07862583bbd897ac4d2bdf89d42ac8c65870c33135bf6f"
 dependencies = [
 "phf 0.11.3",
 "ratex-types",
@@ -4087,9 +4067,9 @@ dependencies = [

 [[package]]
 name = "ratex-types"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cf0be3d050525f0f7d37af55a443d7648c222ccc617639950e3de1f8e6f9900"
+checksum = "ae81208192f9898cbd2424aa42fd4472bd79c44a52092673b101cdca72c89b7c"
 dependencies = [
 "serde",
 ]
@@ -4143,6 +4123,19 @@ dependencies = [
 "once_cell",
 ]

+[[package]]
+name = "read-fonts"
+version = "0.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4edc8db0d972de88e53a085b1f01fb3fbdae7bb0cb7a0ce2b2f8285a412fe3ef"
+dependencies = [
+ "bytemuck",
+ "foldhash 0.2.0",
+ "font-types",
+ "once_cell",
+ "yoke",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -4348,7 +4341,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys 0.12.1",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -4407,7 +4400,7 @@ dependencies = [
 "security-framework",
 "security-framework-sys",
 "webpki-root-certs",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -4882,7 +4875,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68"
 dependencies = [
 "bytemuck",
- "read-fonts",
+ "read-fonts 0.41.0",
+]
+
+[[package]]
+name = "skrifa"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5213b4825bac3587046330052d61bfac7bd3bd0d203c758d7c2ef726fcea034"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.45.1",
 ]

 [[package]]
@@ -5158,7 +5161,7 @@ dependencies = [
 "getrandom 0.4.3",
 "once_cell",
 "rustix 1.1.5",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -6151,7 +6154,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
@@ -6851,20 +6854,6 @@ dependencies = [
 "syn 3.0.6",
 ]

-[[package]]
-name = "zip"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308"
-dependencies = [
- "arbitrary",
- "crc32fast",
- "flate2",
- "indexmap",
- "memchr",
- "zopfli",
-]
-
 [[package]]
 name = "zip"
 version = "9.1.0"
@@ -40,8 +40,8 @@ chrono = { version = "0.4.45", default-features = false, features = ["std", "clo
 web-time = "1.1.0"
 rayon = "1"
 regex = { version = "1", default-features = false, features = ["std", "unicode", "perf"] }
-quick-xml = "0.41"
-zip = { version = "3", default-features = false, features = ["deflate"] }
+quick-xml = "0.42"
+zip = { version = "9", default-features = false, features = ["deflate"] }
 sha2 = { version = "0.11", default-features = false }
 # Decrypting password-protected workbooks ([MS-OFFCRYPTO]): AES and SHA-1, pure Rust (wasm-safe).
 aes = { version = "0.9", default-features = false }
@@ -52,8 +52,8 @@ image = { version = "0.25", default-features = false, features = ["png", "jpeg"]
 # young (0.1.x), and the gate recorded in docs/decisions.md vetted this release.
 ratex-parser = "=0.1.14"
 ratex-layout = "=0.1.14"
-ratex-types = "=0.1.14"
-ratex-font = "=0.1.14"
+ratex-types = "=0.1.15"
+ratex-font = "=0.1.15"

 # ui
 egui = "0.37"
@@ -66,7 +66,7 @@ arboard = { version = "3.6", default-features = false }
 sys-locale = "0.3"
 # Font parser egui's epaint uses; the UI validates system font files with it before handing them
 # to egui, which panics on a file it can't parse. Same version as epaint's, so no second copy.
-skrifa = { version = "0.44", default-features = false, features = ["std"] }
+skrifa = { version = "0.48", default-features = false, features = ["std"] }
 # Real font bytes for tests (Ubuntu Light, compiled into epaint).
 epaint_default_fonts = "0.37"
 # One native window per workbook: the window list, Window menu titles and the immediate-viewport
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use super::*;

 /// Valid table name: letters, digits, `_` and `.`, starting with a letter, `_` or `\`
@@ -23,24 +21,16 @@ pub(super) fn table_name(name: &str, used: &mut HashSet<String>, n: u32) -> Stri
 pub(super) fn table_columns(t: &Table) -> Vec<String> {
    let w = t.range.width() as usize;
    let mut used = HashSet::new();
-    // The next suffix to try per lowercased base, so repeated headers don't retry every suffix
-    // already handed out.
-    let mut next: HashMap<String, u32> = HashMap::new();
    (0..w)
        .map(|i| {
            let base = t.columns.get(i).map(|c| c.name.clone()).filter(|n| !n.trim().is_empty()).unwrap_or_else(|| format!("Column{}", i + 1));
-            let lower = base.to_lowercase();
-            if used.insert(lower.clone()) {
-                return base;
-            }
-            let k = next.entry(lower).or_insert(2);
-            loop {
-                let name = format!("{base}{k}");
-                *k += 1;
-                if used.insert(name.to_lowercase()) {
-                    return name;
-                }
+            let mut name = base.clone();
+            let mut k = 2;
+            while !used.insert(name.to_lowercase()) {
+                name = format!("{base}{k}");
+                k += 1;
            }
+            name
        })
        .collect()
 }
@@ -381,38 +371,3 @@ pub(super) fn vml_xml(sheet: &Sheet, n: u32) -> String {
    s.push_str("</xml>");
    s
 }
-
-#[cfg(test)]
-mod tests {
-    use gridcraft_model::TableColumn;
-
-    use super::*;
-
-    #[test]
-    fn repeated_headers_are_renamed_without_retrying_suffixes() {
-        let col = |n: &str| TableColumn { name: n.into(), totals: TotalsFn::None, totals_label: None, formula: None, unique_name: None, xml: None };
-        let mut columns: Vec<TableColumn> = (0..10_000).map(|_| col("Total")).collect();
-        columns[1] = col("total3");
-        let t = Table {
-            id: 1,
-            name: "T".into(),
-            range: RangeRef::parse("A1:NTP2").unwrap(),
-            header_row: true,
-            totals_row: false,
-            columns,
-            style: String::new(),
-            banded_rows: false,
-            banded_cols: false,
-            first_col: false,
-            last_col: false,
-            filter_button: false,
-            filter: vec![],
-            table_type: None,
-            connection_id: None,
-        };
-        let names = table_columns(&t);
-        assert_eq!(names.len(), 10_000);
-        assert_eq!(&names[..4], ["Total", "total3", "Total2", "Total4"]);
-        assert_eq!(names.iter().map(|n| n.to_lowercase()).collect::<HashSet<_>>().len(), 10_000);
-    }
-}