Update Maud to 0.24.0

Closes #552

Signed-off-by: Xe <me@christine.website>

5 files changed, 20 insertions, 75 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 9e373d8..cad3941 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -150,33 +150,6 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f08f95a202e827209db1491047aa57c18c8adb4c5efcfcfd4a2da4838ee3a72"
-dependencies = [
- "async-trait",
- "bitflags",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "regex",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-util 0.6.10",
- "tower",
- "tower-http 0.1.3",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum"
 version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043"
@@ -202,7 +175,7 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tower",
- "tower-http 0.3.4",
+ "tower-http",
  "tower-layer",
  "tower-service",
 ]
@@ -229,7 +202,7 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69034b3b0fd97923eee2ce8a47540edb21e07f48f87f67d44bb4271cec622bdb"
 dependencies = [
- "axum 0.5.16",
+ "axum",
  "bytes",
  "futures-util",
  "http",
@@ -237,7 +210,7 @@ dependencies = [
  "pin-project-lite",
  "tokio",
  "tower",
- "tower-http 0.3.4",
+ "tower-http",
  "tower-layer",
  "tower-service",
 ]
@@ -1010,7 +983,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util 0.7.3",
+ "tokio-util",
  "tracing",
 ]
 
@@ -1441,19 +1414,21 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
 
 [[package]]
 name = "maud"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7384febb4f8fc970cc2efab1650a6f48cac2e79b0b29587c90497b646fb10e1e"
+checksum = "19aff2cd19eb4b93df29efa602652513b0f731f1d3474f6e377f763fddf61e58"
 dependencies = [
- "axum 0.2.8",
+ "axum-core",
+ "http",
+ "itoa 0.4.8",
  "maud_macros",
 ]
 
 [[package]]
 name = "maud_macros"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "423430ac467408136d7de93f2929debd8a7bc3e795c92476f45e259b158e3355"
+checksum = "e5c114f6f24b08fdd4a25d2fb87a8b140df56b577723247b382e8b04c583f2eb"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -2841,20 +2816,6 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
@@ -2882,7 +2843,7 @@ dependencies = [
  "rand 0.8.5",
  "slab",
  "tokio",
- "tokio-util 0.7.3",
+ "tokio-util",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -2890,22 +2851,6 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81eca72647e58054bbfa41e6f297c23436f1c60aff6e5eb38455a0f9ca420bb5"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "pin-project",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-http"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
@@ -2926,7 +2871,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.3",
+ "tokio-util",
  "tower",
  "tower-layer",
  "tower-service",
@@ -3380,7 +3325,7 @@ dependencies = [
 name = "xesite"
 version = "2.5.0"
 dependencies = [
- "axum 0.5.16",
+ "axum",
  "axum-extra",
  "axum-macros",
  "chrono",
@@ -3421,7 +3366,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tower",
- "tower-http 0.3.4",
+ "tower-http",
  "tracing",
  "tracing-futures",
  "tracing-subscriber",
diff --git a/Cargo.toml b/Cargo.toml
index 1aec1d0..27e07ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ hyper = "0.14"
 kankyo = "0.3"
 lazy_static = "1.4"
 log = "0.4"
-maud = { version = "0.23.0", features = ["axum"] }
+maud = { version = "0.24.0", features = ["axum"] }
 mime = "0.3.0"
 prometheus = { version = "0.13", default-features = false, features = ["process"] }
 rand = "0"
diff --git a/lib/xesite_markdown/Cargo.toml b/lib/xesite_markdown/Cargo.toml
index 08e196f..fd01241 100644
--- a/lib/xesite_markdown/Cargo.toml
+++ b/lib/xesite_markdown/Cargo.toml
@@ -11,7 +11,7 @@ comrak = "0.14.0"
 hex = "0.4"
 lazy_static = "1.4"
 lol_html = "0.3"
-maud = "0.23.0"
+maud = "0.24.0"
 sha2 = "0.10"
 serde_json = "1"
 thiserror = "1"
diff --git a/lib/xesite_templates/Cargo.toml b/lib/xesite_templates/Cargo.toml
index d8a49c0..9aa9fad 100644
--- a/lib/xesite_templates/Cargo.toml
+++ b/lib/xesite_templates/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-maud = "0.23.0"
+maud = "0.24.0"
 uuid = { version = "1", features = [ "v4" ] }
 
 xesite_types = { path = "../xesite_types" }
\ No newline at end of file
diff --git a/src/app/config.rs b/src/app/config.rs
index 537e291..e0a4d90 100644
--- a/src/app/config.rs
+++ b/src/app/config.rs
@@ -83,14 +83,14 @@ impl Display for Salary {
 impl Salary {
     pub fn html(&self) -> Markup {
         if self.stock.is_none() {
-            return html! { (self) };
+            return html! { (maud::display(self)) };
         }
 
         let stock = self.stock.as_ref().unwrap();
         html! {
             details {
                 summary {
-                    (self)
+                    (maud::display(self))
                 }
 
                 p{