From 7e574af1b4669ebf6b4e74bf4cf6dda2a28ee391 Mon Sep 17 00:00:00 2001
From: Michael Bachmann <mbachmann@bbmsoft.net>
Date: Fri, 11 Oct 2024 18:13:00 +0200
Subject: [PATCH] post-merge cleanup

---
 Cargo.lock                   | 125 +++++++++++++++++++++--------------
 worterbuch/src/worterbuch.rs |   2 +-
 2 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a9c7356..f1e5bd7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -109,17 +109,6 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -153,6 +142,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "atomic"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -243,6 +241,26 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
+[[package]]
+name = "bytemuck"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -776,22 +794,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
-name = "memchr"
-version = "2.7.4"
+name = "matchers"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
 
 [[package]]
-name = "miette"
-version = "5.10.0"
+name = "memchr"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
-dependencies = [
- "miette-derive 5.10.0",
- "once_cell",
- "thiserror",
- "unicode-width",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miette"
@@ -802,7 +817,7 @@ dependencies = [
  "backtrace",
  "backtrace-ext",
  "cfg-if",
- "miette-derive 7.2.0",
+ "miette-derive",
  "owo-colors",
  "supports-color",
  "supports-hyperlinks",
@@ -813,17 +828,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "miette-derive"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "miette-derive"
 version = "7.2.0"
@@ -1165,8 +1169,17 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
@@ -1177,9 +1190,15 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.4",
 ]
 
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.4"
@@ -1567,19 +1586,19 @@ dependencies = [
 
 [[package]]
 name = "tokio-graceful-shutdown"
-version = "0.13.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30666f313a52f7e87e9f14212d3e33c2ab59b444c405188ffcf8c36a84ca7688"
+checksum = "fafa3ccdad018530a5eb1c2c87772384fb94273675022240bc5729044f7696e5"
 dependencies = [
- "async-recursion",
  "async-trait",
- "futures",
- "log",
- "miette 5.10.0",
+ "atomic",
+ "bytemuck",
+ "miette",
  "pin-project-lite",
  "thiserror",
  "tokio",
  "tokio-util",
+ "tracing",
 ]
 
 [[package]]
@@ -1696,10 +1715,14 @@ version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
@@ -2066,7 +2089,7 @@ dependencies = [
 
 [[package]]
 name = "worterbuch"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2076,7 +2099,7 @@ dependencies = [
  "hex",
  "jsonwebtoken",
  "log",
- "miette 7.2.0",
+ "miette",
  "poem",
  "serde",
  "serde_json",
@@ -2093,7 +2116,7 @@ dependencies = [
 
 [[package]]
 name = "worterbuch-cli"
-version = "0.45.3"
+version = "0.46.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -2109,7 +2132,7 @@ dependencies = [
 
 [[package]]
 name = "worterbuch-client"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "async-stream",
  "futures-core",
@@ -2124,7 +2147,7 @@ dependencies = [
 
 [[package]]
 name = "worterbuch-common"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "log",
  "random_word",
@@ -2138,13 +2161,13 @@ dependencies = [
 
 [[package]]
 name = "worterbuch-speedtest"
-version = "0.45.2"
+version = "0.46.0"
 dependencies = [
  "clap",
  "dotenv",
  "hostname",
  "log",
- "miette 7.2.0",
+ "miette",
  "poem",
  "serde",
  "serde_json",
diff --git a/worterbuch/src/worterbuch.rs b/worterbuch/src/worterbuch.rs
index c5d553e..da785ff 100644
--- a/worterbuch/src/worterbuch.rs
+++ b/worterbuch/src/worterbuch.rs
@@ -25,7 +25,7 @@ use crate::{
 };
 use hashlink::LinkedHashMap;
 use serde::{Deserialize, Serialize};
-use serde_json::{from_str, json, to_value, Value};
+use serde_json::{from_str, json, Value};
 use std::{
     collections::{hash_map::Entry, HashMap},
     fmt::Display,