From 74117d00a44cf863eec1af61152be23118496e7e Mon Sep 17 00:00:00 2001
From: Xe Iaso <me@xeiaso.net>
Date: Tue, 28 Mar 2023 17:57:31 -0400
Subject: bump uuid from 0.8.2 to 1.2.2

Replaces #586

Signed-off-by: Xe Iaso <me@xeiaso.net>
---
 Cargo.lock            | 19 +++++--------------
 Cargo.toml            |  2 +-
 src/handlers/feeds.rs |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95b9023..b769dc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -129,7 +129,7 @@ checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.8",
 ]
 
 [[package]]
@@ -3018,7 +3018,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "uuid 1.2.2",
+ "uuid",
 ]
 
 [[package]]
@@ -3207,16 +3207,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom 0.2.8",
- "serde",
-]
-
 [[package]]
 name = "uuid"
 version = "1.2.2"
@@ -3224,6 +3214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
 dependencies = [
  "getrandom 0.2.8",
+ "serde",
 ]
 
 [[package]]
@@ -3594,7 +3585,7 @@ dependencies = [
  "tracing-futures",
  "tracing-subscriber",
  "url",
- "uuid 0.8.2",
+ "uuid",
  "xe_jsonfeed",
  "xesite_markdown",
  "xesite_templates",
@@ -3626,7 +3617,7 @@ name = "xesite_templates"
 version = "0.1.0"
 dependencies = [
  "maud",
- "uuid 1.2.2",
+ "uuid",
  "xesite_types",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index eb838e8..ca0054c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ tracing-futures = "0.2"
 tracing-subscriber = { version = "0.3", features = ["fmt"] }
 xml-rs = "0.8"
 url = "2"
-uuid = { version = "0.8", features = ["serde", "v4"] }
+uuid = { version = "1.2", features = ["serde", "v4"] }
 
 # workspace dependencies
 mastodon2text = { path = "./lib/mastodon2text" }
diff --git a/src/handlers/feeds.rs b/src/handlers/feeds.rs
index a0d711f..bc3d861 100644
--- a/src/handlers/feeds.rs
+++ b/src/handlers/feeds.rs
@@ -16,7 +16,7 @@ lazy_static! {
         &["kind"]
     )
     .unwrap();
-    pub static ref ETAG: String = format!(r#"W/"{}""#, uuid::Uuid::new_v4().to_simple());
+    pub static ref ETAG: String = format!(r#"W/"{}""#, uuid::Uuid::new_v4().to_string().replace("-", ""));
     pub static ref CACHEBUSTER: String = uuid::Uuid::new_v4().to_string().replace("-", "");
 }
 
-- 
cgit v1.2.3