From acaf55f7ea77d8e27c9f783453ece9afd7bea5bf Mon Sep 17 00:00:00 2001
From: slonkazoid <slonkazoid@slonk.ing>
Date: Thu, 18 Apr 2024 19:17:33 +0300
Subject: [PATCH] rookie mistake

---
 src/config.rs |  6 +++---
 src/main.rs   | 29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 925f200..789761e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -87,8 +87,8 @@ pub async fn load() -> Result<Config> {
             let mut buf = String::new();
             file.read_to_string(&mut buf)
                 .await
-                .with_context(|| "couldn't read configuration file")?;
-            toml::from_str(&buf).with_context(|| "couldn't parse configuration")
+                .context("couldn't read configuration file")?;
+            toml::from_str(&buf).context("couldn't parse configuration")
         }
         Err(err) => match err.kind() {
             std::io::ErrorKind::NotFound => {
@@ -104,7 +104,7 @@ pub async fn load() -> Result<Config> {
                     Ok(mut file) => file
                         .write_all(
                             toml::to_string_pretty(&config)
-                                .with_context(|| "couldn't serialize configuration")?
+                                .context("couldn't serialize configuration")?
                                 .as_bytes(),
                         )
                         .await
diff --git a/src/main.rs b/src/main.rs
index f6a861a..13db8a2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -141,7 +141,7 @@ async fn main() -> eyre::Result<()> {
 
     let config = config::load()
         .await
-        .with_context(|| "couldn't load configuration")?;
+        .context("couldn't load configuration")?;
 
     let mut tasks = JoinSet::new();
     let mut cancellation_tokens = Vec::new();
@@ -154,7 +154,7 @@ async fn main() -> eyre::Result<()> {
         let compressed = tokio::task::spawn_blocking(|| compress_epicly("static"))
             .await
             .unwrap()
-            .with_context(|| "couldn't compress static")?;
+            .context("couldn't compress static")?;
 
         let _handle = span.enter();
 
@@ -170,7 +170,7 @@ async fn main() -> eyre::Result<()> {
             tasks.spawn(async move {
                 watch(span, passed_token, Default::default())
                     .await
-                    .with_context(|| "failed to watch static")
+                    .context("failed to watch static")
                     .unwrap()
             });
             cancellation_tokens.push(token);
@@ -186,14 +186,14 @@ async fn main() -> eyre::Result<()> {
         let load_cache = async {
             let mut cache_file = tokio::fs::File::open(&path)
                 .await
-                .with_context(|| "failed to open cache file")?;
+                .context("failed to open cache file")?;
             let mut serialized = Vec::with_capacity(4096);
             cache_file
                 .read_to_end(&mut serialized)
                 .await
-                .with_context(|| "failed to read cache file")?;
-            let cache = bitcode::deserialize(serialized.as_slice())
-                .with_context(|| "failed to parse cache")?;
+                .context("failed to read cache file")?;
+            let cache =
+                bitcode::deserialize(serialized.as_slice()).context("failed to parse cache")?;
             Ok::<PostManager, color_eyre::Report>(PostManager::new_with_cache(
                 config.posts_dir.clone(),
                 config.render.clone(),
@@ -260,7 +260,7 @@ async fn main() -> eyre::Result<()> {
         })?;
     let local_addr = listener
         .local_addr()
-        .with_context(|| "couldn't get socket address")?;
+        .context("couldn't get socket address")?;
     info!("listening on http://{}", local_addr);
 
     let sigint = signal::ctrl_c();
@@ -284,7 +284,7 @@ async fn main() -> eyre::Result<()> {
 
     tokio::select! {
         result = &mut server => {
-            result.with_context(|| "failed to serve app")?;
+            result.context("failed to serve app")?;
         },
         _ = sigint => {
             info!("received SIGINT, exiting gracefully");
@@ -299,9 +299,9 @@ async fn main() -> eyre::Result<()> {
         for token in cancellation_tokens {
             token.cancel();
         }
-        server.await.with_context(|| "failed to serve app")?;
+        server.await.context("failed to serve app")?;
         while let Some(task) = tasks.join_next().await {
-            task.with_context(|| "failed to join task")?;
+            task.context("failed to join task")?;
         }
 
         // write cache to file
@@ -311,15 +311,14 @@ async fn main() -> eyre::Result<()> {
         });
         if let Some(path) = config.cache_file.as_ref() {
             let cache = posts.into_cache();
-            let mut serialized =
-                bitcode::serialize(&cache).with_context(|| "failed to serialize cache")?;
+            let mut serialized = bitcode::serialize(&cache).context("failed to serialize cache")?;
             let mut cache_file = tokio::fs::File::create(path)
                 .await
                 .with_context(|| format!("failed to open cache at {}", path.display()))?;
             cache_file
                 .write_all(serialized.as_mut_slice())
                 .await
-                .with_context(|| "failed to write cache to file")?;
+                .context("failed to write cache to file")?;
             info!("wrote cache to {}", path.display());
         }
         Ok::<(), color_eyre::Report>(())
@@ -336,7 +335,7 @@ async fn main() -> eyre::Result<()> {
 
     tokio::select! {
         result = cleanup => {
-            result.with_context(|| "cleanup failed, oh well")?;
+            result.context("cleanup failed, oh well")?;
         },
         _ = sigint => {
             warn!("received second signal, exiting");