From 29355c749e07976a5ad59dc49581ac42440bcf54 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 14 Sep 2020 12:23:05 +0200 Subject: [PATCH] Remove brotli dependency --- server/Cargo.lock | 53 +++--------------------------- server/Cargo.toml | 10 +++--- server/lemmy_rate_limit/Cargo.toml | 2 +- server/lemmy_utils/Cargo.toml | 2 +- 4 files changed, 12 insertions(+), 55 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 4ed9e059..0c50f464 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -139,14 +139,12 @@ dependencies = [ "actix-utils 2.0.0", "base64 0.12.3", "bitflags 1.2.1", - "brotli2", "bytes", "cookie", "copyless", "derive_more", "either", "encoding_rs", - "flate2", "futures-channel", "futures-core", "futures-util", @@ -325,9 +323,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e665de333edabd0421799822dac3e7d8a25a63bb995ae1f60cd99619d8ddda8" +checksum = "cd7fc56022da91a4dc00ccae7d7bb82e539749ca36df181695f4efdf5d413b2e" dependencies = [ "actix-codec 0.3.0", "actix-http", @@ -700,26 +698,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "brotli-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "brotli2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -dependencies = [ - "brotli-sys", - "libc", -] - [[package]] name = "buf-min" version = "0.1.1" @@ -931,15 +909,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if", -] - [[package]] name = "crossbeam-channel" version = "0.4.4" @@ -1289,18 +1258,6 @@ dependencies = [ "ascii_utils", ] -[[package]] -name = "flate2" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" -dependencies = [ - "cfg-if", - "crc32fast", - "libc", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1591,12 +1548,12 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.4.0-alpha.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b44149de8286e9a07aeb72f4dee198530c0fb95df77f36b11138a748788f5603" +checksum = "88c2cc504dd6a2af53b5f2c3dba63aa5d797359df5b64a21e2230bf78146a373" dependencies = [ - "actix-http", "actix-web", + "awc", "base64 0.12.3", "bytes", "chrono", diff --git a/server/Cargo.toml b/server/Cargo.toml index 37fac280..ec8a29d0 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -30,10 +30,10 @@ serde_json = { version = "1.0.52", features = ["preserve_order"]} serde = { version = "1.0.105", features = ["derive"] } actix = "0.10.0" actix-web = { version = "3.0.0", default-features = false, features = ["rustls"] } -actix-files = "0.3.0" -actix-web-actors = "3.0.0" -actix-rt = "1.1.1" -awc = "2.0.0-alpha.2" +actix-files = { version = "0.3.0", default-features = false } +actix-web-actors = { version = "3.0.0", default-features = false } +actix-rt = { version = "1.1.1", default-features = false } +awc = { version = "2.0.0", default-features = false } log = "0.4.0" env_logger = "0.7.1" rand = "0.7.3" @@ -46,7 +46,7 @@ url = { version = "2.1.1", features = ["serde"] } percent-encoding = "2.1.0" openssl = "0.10" http = "0.2.1" -http-signature-normalization-actix = { version = "0.4.0-alpha.2", default-features = false, features = ["sha-2"] } +http-signature-normalization-actix = { version = "0.4.0", default-features = false, features = ["sha-2"] } base64 = "0.12.1" tokio = "0.2.21" futures = "0.3.5" diff --git a/server/lemmy_rate_limit/Cargo.toml b/server/lemmy_rate_limit/Cargo.toml index 949f72f9..dc86523f 100644 --- a/server/lemmy_rate_limit/Cargo.toml +++ b/server/lemmy_rate_limit/Cargo.toml @@ -14,5 +14,5 @@ tokio = "0.2.21" strum = "0.18.0" strum_macros = "0.18.0" futures = "0.3.5" -actix-web = { version = "3.0.0-alpha.3", features = ["rustls"] } +actix-web = { version = "3.0.0", default-features = false, features = ["rustls"] } log = "0.4.0" diff --git a/server/lemmy_utils/Cargo.toml b/server/lemmy_utils/Cargo.toml index a852cb85..be6cb653 100644 --- a/server/lemmy_utils/Cargo.toml +++ b/server/lemmy_utils/Cargo.toml @@ -25,5 +25,5 @@ comrak = "0.7" lazy_static = "1.3.0" openssl = "0.10" url = { version = "2.1.1", features = ["serde"] } -actix-web = "3.0.0-alpha.3" +actix-web = {version = "3.0.0", default-features = false } anyhow = "1.0.32" -- 2.44.1