build: nix flake

4 files changed, 26 insertions, 28 deletions

diff --git a/src/main.rs b/src/main.rs
index 91ff2c6..d5dab7a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(const_extern_fn, async_closure, lazy_cell)]
+#![feature(const_extern_fn, async_closure)]
 #![deny(
   warnings,
   nonstandard_style,
diff --git a/src/modules/api/sydney.rs b/src/modules/api/sydney.rs
index 037dccf..c67e54f 100644
--- a/src/modules/api/sydney.rs
+++ b/src/modules/api/sydney.rs
@@ -8,36 +8,34 @@ pub fn module(router: &mut windmark::router::Router) {
     router,
     "/api/sydney/version",
     "Sydney's version",
-    move |_context| {
-      async move {
-        let mut content = "0.0.0".to_string();
+    move |_context| async move {
+      let mut content = "0.0.0".to_string();
 
-        if let Ok(response) = reqwest::Client::new()
-          .get("https://api.github.com/repos/gemrest/sydney/tags")
-          .header(
-            "User-Agent",
-            format!("{}/{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")),
-          )
-          .send()
-          .await
-        {
-          if let Ok(response_content) = response.json::<Vec<Tags>>().await {
-            let response_content: Vec<Tags> = response_content;
+      if let Ok(response) = reqwest::Client::new()
+        .get("https://api.github.com/repos/gemrest/sydney/tags")
+        .header(
+          "User-Agent",
+          format!("{}/{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")),
+        )
+        .send()
+        .await
+      {
+        if let Ok(response_content) = response.json::<Vec<Tags>>().await {
+          let response_content: Vec<Tags> = response_content;
 
-            if let Some(first_tag) = response_content.first() {
-              content = first_tag.name().clone();
-            }
+          if let Some(first_tag) = response_content.first() {
+            content.clone_from(first_tag.name());
+          }
 
-            if let Some(just_tag) = content.get(1..) {
-              content = just_tag.to_string();
-            }
+          if let Some(just_tag) = content.get(1..) {
+            content = just_tag.to_string();
           }
         }
-
-        windmark::response::Response::success(content)
-          .with_mime("text/plain")
-          .clone()
       }
+
+      windmark::response::Response::success(content)
+        .with_mime("text/plain")
+        .clone()
     },
   );
 }
diff --git a/src/modules/blog/module.rs b/src/modules/blog/module.rs
index e90c380..9d00eea 100644
--- a/src/modules/blog/module.rs
+++ b/src/modules/blog/module.rs
@@ -219,7 +219,7 @@ pub fn module(router: &mut windmark::router::Router) {
 
     for (title, contents) in entries {
       let header = construct_header(&config, &title)
-        .map_or_else(|()| (String::new(), String::new()), |header| header);
+        .unwrap_or_else(|()| (String::new(), String::new()));
       let fixed_blog_name = fixed_blog_name_clone_2.clone();
       let mut real_title = "Unknown";
 
diff --git a/src/modules/web.rs b/src/modules/web.rs
index 9a5369b..2bb2833 100644
--- a/src/modules/web.rs
+++ b/src/modules/web.rs
@@ -4,7 +4,7 @@ use {
     route::track_mount,
     url::{ROOT_GEMINI_URL, ROOT_HTTPS_URL},
   },
-  windmark::response::Response,
+  windmark::{context::RouteContext, response::Response},
 };
 
 fn error(message: &str, context: &windmark::context::RouteContext) -> Response {
@@ -35,7 +35,7 @@ To visit the web version of this exact page, <{ROOT_HTTPS_URL}/web>, you would v
     router,
     "/web/*url",
     "World Wide Web to Gemini Gateway Visitor",
-    async move |context| {
+    async move |context: RouteContext| {
       Response::success({
         let Ok(url) = url::Url::parse(&format!(
           "https://{}",