From 1b220815b93ede99e280a3278eec8c4e48667e89 Mon Sep 17 00:00:00 2001
From: Stefan Holderbach <sholderbach@users.noreply.github.com>
Date: Sat, 17 Feb 2024 16:05:55 +0100
Subject: [PATCH] Bump `calamine` to 0.24 (#11874)

# Description
Update `DataType` to `Data` enum due to breaking change
Supersedes #11834

# User-Facing Changes
None obvious
---
 Cargo.lock                                 |  4 ++--
 crates/nu-command/Cargo.toml               |  2 +-
 crates/nu-command/src/formats/from/ods.rs  | 10 +++++-----
 crates/nu-command/src/formats/from/xlsx.rs | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c2c29a3168..b5ec7f539d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -569,9 +569,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
 [[package]]
 name = "calamine"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47a4d6ea525ea187df1e3a1c4b23469b1cbe60c5bafc1c0ef14b2b8738a8303d"
+checksum = "8a3a315226fdc5b1c3e33521073e1712a05944bc0664d665ff1f6ff0396334da"
 dependencies = [
  "byteorder",
  "codepage",
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 5e7508f045..b2b5236f9c 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -32,7 +32,7 @@ alphanumeric-sort = "1.5"
 base64 = "0.21"
 byteorder = "1.5"
 bytesize = "1.3"
-calamine = "0.23.1"
+calamine = "0.24.0"
 chrono = { version = "0.4", features = ["std", "unstable-locales"], default-features = false }
 chrono-humanize = "0.2.3"
 chrono-tz = "0.8"
diff --git a/crates/nu-command/src/formats/from/ods.rs b/crates/nu-command/src/formats/from/ods.rs
index 2588bb163b..ced195503c 100644
--- a/crates/nu-command/src/formats/from/ods.rs
+++ b/crates/nu-command/src/formats/from/ods.rs
@@ -141,11 +141,11 @@ fn from_ods(
                     .enumerate()
                     .map(|(i, cell)| {
                         let value = match cell {
-                            DataType::Empty => Value::nothing(head),
-                            DataType::String(s) => Value::string(s, head),
-                            DataType::Float(f) => Value::float(*f, head),
-                            DataType::Int(i) => Value::int(*i, head),
-                            DataType::Bool(b) => Value::bool(*b, head),
+                            Data::Empty => Value::nothing(head),
+                            Data::String(s) => Value::string(s, head),
+                            Data::Float(f) => Value::float(*f, head),
+                            Data::Int(i) => Value::int(*i, head),
+                            Data::Bool(b) => Value::bool(*b, head),
                             _ => Value::nothing(head),
                         };
 
diff --git a/crates/nu-command/src/formats/from/xlsx.rs b/crates/nu-command/src/formats/from/xlsx.rs
index fbcb1df14b..4abecc66f4 100644
--- a/crates/nu-command/src/formats/from/xlsx.rs
+++ b/crates/nu-command/src/formats/from/xlsx.rs
@@ -140,11 +140,11 @@ fn from_xlsx(
                     .enumerate()
                     .map(|(i, cell)| {
                         let value = match cell {
-                            DataType::Empty => Value::nothing(head),
-                            DataType::String(s) => Value::string(s, head),
-                            DataType::Float(f) => Value::float(*f, head),
-                            DataType::Int(i) => Value::int(*i, head),
-                            DataType::Bool(b) => Value::bool(*b, head),
+                            Data::Empty => Value::nothing(head),
+                            Data::String(s) => Value::string(s, head),
+                            Data::Float(f) => Value::float(*f, head),
+                            Data::Int(i) => Value::int(*i, head),
+                            Data::Bool(b) => Value::bool(*b, head),
                             _ => Value::nothing(head),
                         };