actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2024-11-27 16:02:57 +01:00
Code Issues Releases Wiki Activity

chore: remove fluent crate override

Browse Source
This commit is contained in:
Rob Ede 2022-08-28 18:43:05 +01:00
parent 818d8b1384
commit 0319f18995
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -2566,8 +2566,9 @@ dependencies = [
[[package]] [[package]]
name = "fluent-template-macros" name = "fluent-template-macros"
version = "0.7.1" version = "0.8.0"
source = "git+https://github.com/XAMPPRocky/fluent-templates.git?rev=82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c#82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dec7592cd1f45c1afe9084ce59c62a3a7c266c125c4c2ec97e95b0563c4aa914"
dependencies = [ dependencies = [
"flume", "flume",
"ignore", "ignore",
@ -2580,8 +2581,9 @@ dependencies = [
[[package]] [[package]]
name = "fluent-templates" name = "fluent-templates"
version = "0.7.1" version = "0.8.0"
source = "git+https://github.com/XAMPPRocky/fluent-templates.git?rev=82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c#82b50baf6232e1ce2e9629ce2a8fcc12ab5d942c" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c3ef2c2152757885365abce32ddf682746062f1b6b3c0824a29fbed6ee4d080"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"fluent", "fluent",

5
Cargo.toml
View File

@ -64,8 +64,3 @@ exclude = [
# uses incompatible libsqlite-sys to other examples # uses incompatible libsqlite-sys to other examples
"databases/diesel", "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" }

4
forms/multipart-s3/src/client.rs
View File

@ -50,9 +50,7 @@ impl Client {
.content_length() .content_length()
.try_into() .try_into()
.expect("file has invalid size"), .expect("file has invalid size"),
object object.body.map_err(error::ErrorInternalServerError),
.body
.map_err(|err| error::ErrorInternalServerError(err)),
)) ))
} }

2
shutdown-server/src/main.rs
View File

@ -9,7 +9,7 @@ async fn hello() -> &'static str {
#[post("/stop/{graceful}")] #[post("/stop/{graceful}")]
async fn stop(Path(graceful): Path<bool>, stop_handle: web::Data<StopHandle>) -> HttpResponse { 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() HttpResponse::NoContent().finish()
} }

2
templating/fluent/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
actix-web = "4" actix-web = "4"
actix-web-lab = "0.17" 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"] } handlebars = { version = "4.3", features = ["dir_source"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"