From 9e13c749993e500b8abc4473869fe25b432fd3b8 Mon Sep 17 00:00:00 2001
From: zyl <z@zyl.gay>
Date: Fri, 21 Jun 2024 15:01:38 -0700
Subject: [PATCH] change serde_yaml to serde_yml

---
 Cargo.lock     | 73 ++++++++++++++++++++++++++++++++++++++++++--------
 Cargo.toml     |  2 +-
 src/lib.rs     |  2 +-
 src/serving.rs |  2 +-
 4 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cdc96c1..e81f979 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -411,6 +411,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "extract-frontmatter"
 version = "4.1.1"
@@ -427,6 +437,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
 [[package]]
 name = "file-id"
 version = "0.1.0"
@@ -1071,6 +1087,18 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
+[[package]]
+name = "libyml"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e281a65eeba3d4503a2839252f86374528f9ceafe6fed97c1d3b52e1fb625c1"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
 [[package]]
 name = "litemap"
 version = "0.7.3"
@@ -1708,6 +1736,19 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -1805,16 +1846,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
+name = "serde_yml"
+version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
  "indexmap",
  "itoa 1.0.11",
+ "libyml",
+ "log",
+ "memchr",
  "ryu",
  "serde",
- "unsafe-libyaml",
+ "serde_json",
+ "tempfile",
 ]
 
 [[package]]
@@ -1940,6 +1985,18 @@ dependencies = [
  "syn 2.0.66",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "thin-slice"
 version = "0.1.1"
@@ -2179,12 +2236,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
 [[package]]
 name = "url"
 version = "2.5.1"
@@ -2619,7 +2670,7 @@ dependencies = [
  "pulldown-cmark",
  "rss",
  "serde",
- "serde_yaml",
+ "serde_yml",
  "time",
  "tokio",
  "url",
diff --git a/Cargo.toml b/Cargo.toml
index 7110fc6..6e3f9c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ pulldown-cmark = {version = "0.11", default-features = false, features = [
 ]}
 rss = {version = "2", features = ["validation"]}
 serde = {version = "1", features = ["derive"]}
-serde_yaml = "0.9"
+serde_yml = "0.0.10"
 time = {version = "0.3", features = ["serde-human-readable"]}
 tokio = {version = "1.10", features = [
   "macros",
diff --git a/src/lib.rs b/src/lib.rs
index 00351f2..c3db3c1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -87,7 +87,7 @@ pub struct Site {
 impl Site {
 	/// Creates a new site from the given path.
 	pub fn new(site_path: &Path) -> eyre::Result<Self> {
-		let config: SiteConfig = serde_yaml::from_str(
+		let config: SiteConfig = serde_yml::from_str(
 			&std::fs::read_to_string(site_path.join("config.yaml"))
 				.wrap_err("Failed to read site config")?,
 		)
diff --git a/src/serving.rs b/src/serving.rs
index 09a6f53..a6c2a9b 100644
--- a/src/serving.rs
+++ b/src/serving.rs
@@ -61,7 +61,7 @@ fn create(
 			builder.build_blog()?;
 		}
 	} else if relative_path.display().to_string() == "config.yaml" {
-		let new_config = serde_yaml::from_str(&std::fs::read_to_string(path)?)?;
+		let new_config = serde_yml::from_str(&std::fs::read_to_string(path)?)?;
 		builder.site.config = new_config;
 		builder.site.build_all_pages(builder)?;
 	} else if let Ok(_sass_path) = relative_path.strip_prefix(SASS_PATH) {