From 994bf0b6ef57613ba0bc191cbe9461a9fff87b43 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Sat, 26 Jun 2021 18:14:43 -0500
Subject: [PATCH] Update to latest actix betas

---
 Cargo.lock  | 30 ++++++++++++++++--------------
 Cargo.toml  |  4 ++--
 src/main.rs | 14 +++++++-------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 97abfea..8fd84a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,9 +45,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",
@@ -180,9 +180,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",
@@ -195,6 +195,7 @@ dependencies = [
  "actix-web-codegen",
  "ahash 0.7.4",
  "bytes",
+ "cfg-if",
  "derive_more",
  "either",
  "encoding_rs",
@@ -365,9 +366,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",
@@ -375,6 +376,7 @@ dependencies = [
  "actix-service",
  "base64",
  "bytes",
+ "cfg-if",
  "cookie",
  "derive_more",
  "futures-core",
@@ -1579,9 +1581,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"
@@ -1900,9 +1902,9 @@ dependencies = [
 
 [[package]]
 name = "rsass"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba9686668e9ac9135a5f814f8882e6e872927d7f7bcf8a48b384c72aa7673f6"
+checksum = "0521270960b3d962dc8cbb130f8ee6e79d574cf7dede1ce1f8a036d8d6b958eb"
 dependencies = [
  "lazy_static",
  "nom 6.2.1",
@@ -1916,9 +1918,9 @@ dependencies = [
 
 [[package]]
 name = "ructe"
-version = "0.13.2"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5678e9cc1545f229509acb67cf34793802646f32c77e00bc470b518cfddea579"
+checksum = "c6fd2f3b927021cc8586d365c36d16d82d91fdae0a3839819c12c8e86e0f929e"
 dependencies = [
  "base64",
  "bytecount",
@@ -2098,9 +2100,9 @@ dependencies = [
 
 [[package]]
 name = "simple_asn1"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31e6cf34ad4321d3a2b8f934949b429e314519f753a77962f16c664dca8e13"
+checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80"
 dependencies = [
  "chrono",
  "num-bigint 0.4.0",
diff --git a/Cargo.toml b/Cargo.toml
index 42e5646..67dca09 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,14 +15,14 @@ build = "src/build.rs"
 [dependencies]
 anyhow = "1.0"
 actix-rt = "2.0.2"
-actix-web = { version = "4.0.0-beta.7", default-features = false, features = ["compress"] }
+actix-web = { version = "4.0.0-beta.7", default-features = false, features = ["compress-brotli", "compress-gzip", "compress-zstd"] }
 actix-webfinger = "0.4.0-beta.3"
 activitystreams = "0.7.0-alpha.10"
 activitystreams-ext = "0.1.0-alpha.2"
 ammonia = "3.1.0"
 async-mutex = "1.0.1"
 async-rwlock = "1.3.0"
-awc = { version = "3.0.0-beta.6", default-features = false, features = ["rustls", "compress"] }
+awc = { version = "3.0.0-beta.6", default-features = false, features = ["compress-brotli", "compress-gzip", "compress-zstd", "rustls"] }
 background-jobs = "0.9.0"
 base64 = "0.13"
 chrono = "0.4.19"
diff --git a/src/main.rs b/src/main.rs
index 1191671..1933cd4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -79,13 +79,13 @@ async fn main() -> Result<(), anyhow::Error> {
         App::new()
             .wrap(Compress::default())
             .wrap(Logger::default())
-            .data(db.clone())
-            .data(state.clone())
-            .data(state.requests())
-            .data(actors.clone())
-            .data(config.clone())
-            .data(job_server.clone())
-            .data(media.clone())
+            .app_data(web::Data::new(db.clone()))
+            .app_data(web::Data::new(state.clone()))
+            .app_data(web::Data::new(state.requests()))
+            .app_data(web::Data::new(actors.clone()))
+            .app_data(web::Data::new(config.clone()))
+            .app_data(web::Data::new(job_server.clone()))
+            .app_data(web::Data::new(media.clone()))
             .service(web::resource("/").route(web::get().to(index)))
             .service(web::resource("/media/{path}").route(web::get().to(routes::media)))
             .service(