actix: Final dependencies for conversion

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Cargo.lock b/Cargo.lock
index b8da1555abc5054a35ffae242421ef1d8f69e08e..92ea1bef197e5624907ae7ea9502eb749a861b62 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -374,6 +374,17 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
 
+[[package]]
+name = "async-condvar-fair"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea38fc7218cdf1d5620a4a1af6ccad4d793cd7d0e1204d20eb33e29d1c49e92"
+dependencies = [
+ "dlv-list",
+ "parking_lot 0.12.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.52"
@@ -1176,6 +1187,15 @@ dependencies = [
  "syn 1.0.89",
 ]
 
+[[package]]
+name = "dlv-list"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
+dependencies = [
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "docopt"
 version = "1.1.1"
@@ -2783,6 +2803,7 @@ name = "otter"
 version = "0.7.3"
 dependencies = [
  "anyhow",
+ "async-condvar-fair",
  "backtrace",
  "base64 0.13.0",
  "boolinator",
@@ -2912,6 +2933,7 @@ dependencies = [
  "actix-web",
  "fehler",
  "futures",
+ "mime 0.3.16",
  "num-traits",
  "otter",
  "otter-base",
@@ -2922,6 +2944,7 @@ dependencies = [
  "serde_with",
  "structopt",
  "strum",
+ "tokio",
 ]
 
 [[package]]

diff --git a/Cargo.toml b/Cargo.toml
index 71b19aac356005a84eb05eccf233fb49e8a856e1..b64d723447b701b8fb4a628d5991d83f3d2752b5 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,6 +83,7 @@ vecdeque-stableix="1"
 xmlparser = "0.13"
 zip="0.5"
 
+async-condvar-fair = { version="0.2", features=["parking_lot_0_12"] }
 enum-map     = { version="2"    , features=["serde"       ] }
 flexi_logger = { version="0.22" , features=["specfile"    ] }
 image = { version = "0.24", default-features=false, features=["jpeg","png"] }

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 9a1dbb74f4beb3e6441a7cccdedfe20c3137328c..5e7657712a667d1dfd031f3c5ad72d54f6472c8d 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -42,10 +42,13 @@ rocket_cors="0.5"
 serde_with="1"
 structopt="0.3"
 
+mime = "0.3"
 actix-web = "4"
 actix-files = "0.6"
 actix-cors = "0.6"
 
+tokio        = { version="1",     features=["full","parking_lot"] }
+
 rocket = { version="^0.4.6", features=["sse"] }
 rocket_contrib = { version="0.4", default-features=false, features=["tera_templates", "helmet", "json", "serve"] }
 

diff --git a/src/imports.rs b/src/imports.rs
index 450d3cc0a94c2a1056096558efd592571c0d0d25..88937c970270ba0df81f447d98790827611378f6 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -6,6 +6,7 @@ pub use otter_base;
 pub use otter_base::imports::*;
 
 pub use anyhow;
+pub use async_condvar_fair;
 pub use base64;
 pub use boolinator;
 pub use cast_trait_object;