From ba32ab5290f3fe54e19d569af2d15e72f1c35a87 Mon Sep 17 00:00:00 2001
From: Leonora Tindall <nora@nora.codes>
Date: Wed, 1 Mar 2023 15:24:28 -0600
Subject: [PATCH] Update to WG Upstream (#4)

* Fix typo: pretter -> pretty

* fix: corrected spelling of "minimalistic"

* Fix various build warnings.

---------

Co-authored-by: Jonas Geiler <skayo.dev@gmail.com>
---
 build.rs                      | 2 +-
 src/models/maybe_redirect.rs  | 3 +++
 src/routes/pretty_retrieve.rs | 6 +++---
 src/routes/submit.rs          | 2 +-
 templates/base.html.tera      | 2 +-
 templates/index.html.tera     | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.rs b/build.rs
index 85070ac..c5c0c3b 100644
--- a/build.rs
+++ b/build.rs
@@ -1,7 +1,7 @@
 use std::process::Command;
 fn main() {
     let output = Command::new("git")
-        .args(&["rev-parse", "HEAD"])
+        .args(["rev-parse", "HEAD"])
         .output()
         .unwrap();
     let git_hash = String::from_utf8(output.stdout).unwrap();
diff --git a/src/models/maybe_redirect.rs b/src/models/maybe_redirect.rs
index 91ff7f9..2377d4c 100644
--- a/src/models/maybe_redirect.rs
+++ b/src/models/maybe_redirect.rs
@@ -1,6 +1,9 @@
 use rocket::{response::Redirect, Responder};
 use rocket_dyn_templates::Template;
 
+// Allowed LEV because Rocket doesn't let us box Responders like Redirect.
+// See https://github.com/SergioBenitez/Rocket/issues/568
+#[allow(clippy::large_enum_variant)]
 #[derive(Responder)]
 pub enum MaybeRedirect {
     Redirect(Redirect),
diff --git a/src/routes/pretty_retrieve.rs b/src/routes/pretty_retrieve.rs
index 207965f..3be359d 100644
--- a/src/routes/pretty_retrieve.rs
+++ b/src/routes/pretty_retrieve.rs
@@ -14,7 +14,7 @@ use crate::models::response_wrapper::ResponseWrapper;
 
 #[get("/p/<id>", rank = 2)]
 pub async fn pretty_retrieve(id: PasteId<'_>) -> ResponseWrapper<Template> {
-    pretter_retrieve_inner(&id.to_string(), "txt").await
+    pretty_retrieve_inner(&id.to_string(), "txt").await
 }
 
 #[get("/p/<id_ext>", rank = 1)]
@@ -24,10 +24,10 @@ pub async fn pretty_retrieve_ext(
     let id = id_ext.get_fname();
     let ext = id_ext.get_ext();
 
-    pretter_retrieve_inner(id, ext).await
+    pretty_retrieve_inner(id, ext).await
 }
 
-pub async fn pretter_retrieve_inner(
+pub async fn pretty_retrieve_inner(
     id: &str,
     ext: &str,
 ) -> ResponseWrapper<Template> {
diff --git a/src/routes/submit.rs b/src/routes/submit.rs
index 6ffd84f..0422d87 100644
--- a/src/routes/submit.rs
+++ b/src/routes/submit.rs
@@ -19,7 +19,7 @@ pub async fn submit(paste: Form<PasteIdForm>) -> Redirect {
     let content = &paste.content;
     let ext = &paste.ext;
 
-    fs::write(&filepath, content).expect("Unable to write to the file");
+    fs::write(filepath, content).expect("Unable to write to the file");
 
     Redirect::to(format!("/p/{id}.{ext}", id = id, ext = ext))
 }
diff --git a/templates/base.html.tera b/templates/base.html.tera
index f05cf8a..149f0ea 100644
--- a/templates/base.html.tera
+++ b/templates/base.html.tera
@@ -5,7 +5,7 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="Description" content="Author: Gunwant Jain,
-    A highly opinionated and minamalistic Pastebin." />
+    A highly opinionated and minimalistic Pastebin." />
 
   <link rel="apple-touch-icon" href="/static/media/apple-touch-icon.png" />
   <link rel="icon" type="image/png" sizes="192x192" href="/static/media/android-chrome-192x192.png" />
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 92d3b0b..7bade57 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -9,7 +9,7 @@
 bin(3)                                BIN                               bin(3)
 
 NAME
-       bin - A highly opinionated and minamalistic Pastebin
+       bin - A highly opinionated and minimalistic Pastebin
 
 ROUTES
        GET /