chore: remove fluent crate override

actix · Aug 28, 2022 · 0319f18 · 0319f18
1 parent 818d8b1
commit 0319f18
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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"