From a2c17a950b9b70ab30ee07448b70a08497de1088 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Sat, 26 Jun 2021 13:10:28 -0500
Subject: [PATCH] Update actix deps

---
 Cargo.lock  | 32 +++++++++++++++++---------------
 Cargo.toml  |  8 ++++----
 src/main.rs |  6 +++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ea04d8..2dba709 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -48,9 +48,9 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.0.0-beta.7"
+version = "3.0.0-beta.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6b8dd8ffcb0277cebef2c4b496821c888e0320817c1862a83359d4e384797a"
+checksum = "3cd16d6b846983ffabfd081e1a67abd7698094fcbe7b3d9bcf1acbc6f546a516"
 dependencies = [
  "actix-codec",
  "actix-rt",
@@ -202,9 +202,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.0.0-beta.7"
+version = "4.0.0-beta.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944b85410c2f6e22529d25e92506491f669c3336b8dc50ad2603f4f611ffdaf3"
+checksum = "c503f726f895e55dac39adeafd14b5ee00cc956796314e9227fc7ae2e176f443"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -217,6 +217,7 @@ dependencies = [
  "actix-web-codegen",
  "ahash",
  "bytes",
+ "cfg-if",
  "cookie",
  "derive_more",
  "either",
@@ -341,9 +342,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "awc"
-version = "3.0.0-beta.6"
+version = "3.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15ffe93051a6e05151f310862b6097b58c40e873352083caa820c406392732b2"
+checksum = "364ef81705bf38403a3c3da4fab9eeec1e1503cd72dd6cd7c4259d2a6b08aa98"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -351,6 +352,7 @@ dependencies = [
  "actix-service",
  "base64",
  "bytes",
+ "cfg-if",
  "derive_more",
  "futures-core",
  "itoa",
@@ -549,9 +551,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
+checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
 dependencies = [
  "libc",
 ]
@@ -881,9 +883,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -1229,7 +1231,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pict-rs"
-version = "0.3.0-alpha.11"
+version = "0.3.0-alpha.12"
 dependencies = [
  "actix-form-data",
  "actix-fs",
@@ -1282,9 +1284,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -1975,9 +1977,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
+checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 6f7bc9c..acf78ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pict-rs"
 description = "A simple image hosting service"
-version = "0.3.0-alpha.11"
+version = "0.3.0-alpha.12"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
@@ -13,11 +13,11 @@ edition = "2018"
 [dependencies]
 actix-form-data = "0.6.0-beta.1"
 actix-fs = { git = "https://git.asonix.dog/asonix/actix-fs", branch = "asonix/actix-rt-2" }
-actix-rt = "2.0.2"
-actix-web = { version = "4.0.0-beta.4", default-features = false, features = ["compress"] }
+actix-rt = "2.2.0"
+actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["compress-brotli", "compress-gzip", "compress-zstd"] }
 anyhow = "1.0"
 async-stream = "0.3.0"
-awc = { version = "3.0.0-beta.3", default-features = false, features = ["compress", "rustls"] }
+awc = { version = "3.0.0-beta.7", default-features = false, features = ["compress-brotli", "compress-gzip", "compress-zstd", "rustls"] }
 base64 = "0.13.0"
 futures = "0.3.4"
 magick_rust = { version = "0.14.0", git = "https://git.asonix.dog/asonix/magick-rust.git" }
diff --git a/src/main.rs b/src/main.rs
index f97bfcc..7cddf91 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -750,9 +750,9 @@ async fn main() -> Result<(), anyhow::Error> {
             .wrap(Compress::default())
             .wrap(Logger::default())
             .wrap(Tracing)
-            .data(manager.clone())
-            .data(client)
-            .data(CONFIG.filter_whitelist())
+            .app_data(web::Data::new(manager.clone()))
+            .app_data(web::Data::new(client))
+            .app_data(web::Data::new(CONFIG.filter_whitelist()))
             .service(
                 web::scope("/image")
                     .service(