From 0319f1899525cd72e10b032c69ab46c524dd0fe3 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 28 Aug 2022 18:43:05 +0100
Subject: [PATCH] chore: remove fluent crate override

---
 Cargo.lock                       | 10 ++++++----
 Cargo.toml                       |  5 -----
 forms/multipart-s3/src/client.rs |  4 +---
 shutdown-server/src/main.rs      |  2 +-
 templating/fluent/Cargo.toml     |  2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ace73502..08c6eb85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2566,8 +2566,9 @@ dependencies = [
 
 [[package]]
 name = "fluent-template-macros"
-version = "0.7.1"
-source = "git+https://github.com/XAMPPRocky/fluent-templates.git?rev=82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c#82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec7592cd1f45c1afe9084ce59c62a3a7c266c125c4c2ec97e95b0563c4aa914"
 dependencies = [
  "flume",
  "ignore",
@@ -2580,8 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "fluent-templates"
-version = "0.7.1"
-source = "git+https://github.com/XAMPPRocky/fluent-templates.git?rev=82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c#82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c3ef2c2152757885365abce32ddf682746062f1b6b3c0824a29fbed6ee4d080"
 dependencies = [
  "arc-swap",
  "fluent",
diff --git a/Cargo.toml b/Cargo.toml
index f956e3a9..b7bf64a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,8 +64,3 @@ exclude = [
    # uses incompatible libsqlite-sys to other examples
    "databases/diesel",
 ]
-
-[patch.crates-io]
-# FIXME: Specify commit until https://github.com/XAMPPRocky/fluent-templates/pull/36 is released
-fluent-templates = { git = "https://github.com/XAMPPRocky/fluent-templates.git", rev = "82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c" }
-fluent-template-macros = { git = "https://github.com/XAMPPRocky/fluent-templates.git", rev = "82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c" }
diff --git a/forms/multipart-s3/src/client.rs b/forms/multipart-s3/src/client.rs
index 9c563b08..a6eea7eb 100644
--- a/forms/multipart-s3/src/client.rs
+++ b/forms/multipart-s3/src/client.rs
@@ -50,9 +50,7 @@ impl Client {
                 .content_length()
                 .try_into()
                 .expect("file has invalid size"),
-            object
-                .body
-                .map_err(|err| error::ErrorInternalServerError(err)),
+            object.body.map_err(error::ErrorInternalServerError),
         ))
     }
 
diff --git a/shutdown-server/src/main.rs b/shutdown-server/src/main.rs
index c0cfdf50..7d5db9a3 100644
--- a/shutdown-server/src/main.rs
+++ b/shutdown-server/src/main.rs
@@ -9,7 +9,7 @@ async fn hello() -> &'static str {
 
 #[post("/stop/{graceful}")]
 async fn stop(Path(graceful): Path<bool>, stop_handle: web::Data<StopHandle>) -> HttpResponse {
-    let _ = stop_handle.stop(graceful);
+    stop_handle.stop(graceful);
     HttpResponse::NoContent().finish()
 }
 
diff --git a/templating/fluent/Cargo.toml b/templating/fluent/Cargo.toml
index fa4739a7..d344b7dc 100644
--- a/templating/fluent/Cargo.toml
+++ b/templating/fluent/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 actix-web = "4"
 actix-web-lab = "0.17"
-fluent-templates = { version = "0.7", features = ["handlebars"] }
+fluent-templates = { version = "0.8", features = ["handlebars"] }
 handlebars = { version = "4.3", features = ["dir_source"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"