From 1d74c3befae9f409ca15b9152eb766760a1391d1 Mon Sep 17 00:00:00 2001
From: Brian Heineman <brian.heineman@gmail.com>
Date: Sat, 8 Feb 2025 12:39:49 -0700
Subject: [PATCH] fix: address RUSTSEC-2024-0370 by updating tabled to 0.18
 (#573)

---
 Cargo.lock | 45 +++++++++++++++++++++++++++++++++------------
 Cargo.toml |  2 +-
 deny.toml  |  1 -
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0e7156e4..b9e443261 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5046,9 +5046,9 @@ dependencies = [
 
 [[package]]
 name = "papergrid"
-version = "0.12.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7419ad52a7de9b60d33e11085a0fe3df1fbd5926aa3f93d3dd53afbc9e86725"
+checksum = "b915f831b85d984193fdc3d3611505871dc139b2534530fa01c1a6a6707b6723"
 dependencies = [
  "bytecount",
  "fnv",
@@ -5476,7 +5476,6 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
  "version_check",
 ]
 
@@ -5491,6 +5490,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.80",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.88"
@@ -7164,9 +7185,9 @@ dependencies = [
 
 [[package]]
 name = "tabled"
-version = "0.16.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c9303ee60b9bedf722012ea29ae3711ba13a67c9b9ae28993838b63057cb1b"
+checksum = "121d8171ee5687a4978d1b244f7d99c43e7385a272185a2f1e1fa4dc0979d444"
 dependencies = [
  "papergrid",
  "tabled_derive",
@@ -7174,15 +7195,15 @@ dependencies = [
 
 [[package]]
 name = "tabled_derive"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0fb8bfdc709786c154e24a66777493fb63ae97e3036d914c8666774c477069"
+checksum = "52d9946811baad81710ec921809e2af67ad77719418673b2a3794932d57b7538"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
+ "heck 0.5.0",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.80",
 ]
 
 [[package]]
@@ -7762,9 +7783,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "unicode-xid"
diff --git a/Cargo.toml b/Cargo.toml
index 5ae4307bd..f3610455b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,7 +62,7 @@ serde_urlencoded = "0.7"
 serde_yaml = "0.9"
 slog = "2.7"
 slug = "0.1"
-tabled = "0.16"
+tabled = "0.18"
 thiserror = "1.0"
 tokio = "1.40"
 typeshare = "1.0"
diff --git a/deny.toml b/deny.toml
index 65fe8fd46..9b6dd079a 100644
--- a/deny.toml
+++ b/deny.toml
@@ -14,7 +14,6 @@ targets = [
 
 [advisories]
 ignore = [
-    "RUSTSEC-2024-0370",
     "RUSTSEC-2024-0384",
     "RUSTSEC-2024-0399",
     "RUSTSEC-2024-0402",