From dd83f4a859ad3ccb01a8c25c1ad30bddeb7d40f7 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Sun, 13 Sep 2020 19:46:13 -0500
Subject: [PATCH] Stable releases
---
Cargo.lock | 208 +++++++++++++++++++-----------------------------
Cargo.toml | 8 +-
src/requests.rs | 4 +-
3 files changed, 87 insertions(+), 133 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index c1890a0..2d75f8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ checksum = "261b423734cca2a170d7a76936f1f0f9e6c6fc297d36cfc5ea6aa15f9017f996"
dependencies = [
"chrono",
"mime",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"thiserror",
"url",
@@ -21,25 +21,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e"
dependencies = [
"activitystreams",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
]
-[[package]]
-name = "actix-codec"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380"
-dependencies = [
- "bitflags",
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "tokio",
- "tokio-util 0.2.0",
-]
-
[[package]]
name = "actix-codec"
version = "0.3.0"
@@ -53,7 +38,7 @@ dependencies = [
"log",
"pin-project",
"tokio",
- "tokio-util 0.3.1",
+ "tokio-util",
]
[[package]]
@@ -62,10 +47,10 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc"
dependencies = [
- "actix-codec 0.3.0",
+ "actix-codec",
"actix-rt",
"actix-service",
- "actix-utils 2.0.0",
+ "actix-utils",
"derive_more",
"either",
"futures-util",
@@ -80,17 +65,17 @@ dependencies = [
[[package]]
name = "actix-http"
-version = "2.0.0-beta.4"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10621f225411d86d5aa703da1cd11c93c0fdf4c3e07806997f6991732dc048c"
+checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab"
dependencies = [
- "actix-codec 0.3.0",
+ "actix-codec",
"actix-connect",
"actix-rt",
"actix-service",
"actix-threadpool",
"actix-tls",
- "actix-utils 2.0.0",
+ "actix-utils",
"base64",
"bitflags",
"brotli2",
@@ -118,12 +103,12 @@ dependencies = [
"pin-project",
"rand",
"regex",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"serde_urlencoded",
"sha-1",
"slab",
- "time 0.2.18",
+ "time 0.2.19",
]
[[package]]
@@ -146,7 +131,7 @@ dependencies = [
"http",
"log",
"regex",
- "serde 1.0.115",
+ "serde 1.0.116",
]
[[package]]
@@ -166,14 +151,14 @@ dependencies = [
[[package]]
name = "actix-server"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d74b464215a473c973a2d7d03a69cc10f4ce1f4b38a7659c5193dc5c675630"
+checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e"
dependencies = [
- "actix-codec 0.2.0",
+ "actix-codec",
"actix-rt",
"actix-service",
- "actix-utils 1.0.6",
+ "actix-utils",
"futures-channel",
"futures-util",
"log",
@@ -229,9 +214,9 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb"
dependencies = [
- "actix-codec 0.3.0",
+ "actix-codec",
"actix-service",
- "actix-utils 2.0.0",
+ "actix-utils",
"futures-util",
"rustls",
"tokio-rustls",
@@ -239,31 +224,13 @@ dependencies = [
"webpki-roots",
]
-[[package]]
-name = "actix-utils"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e"
-dependencies = [
- "actix-codec 0.2.0",
- "actix-rt",
- "actix-service",
- "bitflags",
- "bytes",
- "either",
- "futures",
- "log",
- "pin-project",
- "slab",
-]
-
[[package]]
name = "actix-utils"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a"
dependencies = [
- "actix-codec 0.3.0",
+ "actix-codec",
"actix-rt",
"actix-service",
"bitflags",
@@ -279,11 +246,11 @@ dependencies = [
[[package]]
name = "actix-web"
-version = "3.0.0-beta.4"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbfafbef7fc52b38836bf9d976dbfa57331eb3491f46529a3b31f6b18c756007"
+checksum = "cd7fc56022da91a4dc00ccae7d7bb82e539749ca36df181695f4efdf5d413b2e"
dependencies = [
- "actix-codec 0.3.0",
+ "actix-codec",
"actix-http",
"actix-macros",
"actix-router",
@@ -293,7 +260,7 @@ dependencies = [
"actix-testing",
"actix-threadpool",
"actix-tls",
- "actix-utils 2.0.0",
+ "actix-utils",
"actix-web-codegen",
"awc",
"bytes",
@@ -308,20 +275,20 @@ dependencies = [
"pin-project",
"regex",
"rustls",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"serde_urlencoded",
"socket2",
- "time 0.2.18",
+ "time 0.2.19",
"tinyvec",
"url",
]
[[package]]
name = "actix-web-codegen"
-version = "0.3.0-beta.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9679f5b1f4c819de08b63b0a61a131b2fdc30b367c2c208984fda8eaa07fa0"
+checksum = "750ca8fb60bbdc79491991650ba5d2ae7cd75f3fc00ead51390cfe9efda0d4d8"
dependencies = [
"proc-macro2",
"quote",
@@ -330,13 +297,12 @@ dependencies = [
[[package]]
name = "actix-webfinger"
-version = "0.3.0-alpha.6"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb66d471f2af5a9ea7b48ea4456f117c56cd1b2348e52ae8d3bc95cddeebf4c"
+checksum = "04d2d2618ebae185c8178e09921854e18ecb0824f9892085107d6a254a4605e5"
dependencies = [
- "actix-http",
"actix-web",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_derive",
"thiserror",
]
@@ -458,11 +424,11 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "awc"
-version = "2.0.0-beta.4"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96f8e83028cb7516a0f84ec64870681521fc0ce66c860595e84948fcd3a8af3b"
+checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575"
dependencies = [
- "actix-codec 0.3.0",
+ "actix-codec",
"actix-http",
"actix-rt",
"actix-service",
@@ -475,16 +441,16 @@ dependencies = [
"percent-encoding",
"rand",
"rustls",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"serde_urlencoded",
]
[[package]]
name = "background-jobs"
-version = "0.8.0-alpha.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb38c4a5de33324650e9023829b0f4129eb5418b29f5dfe69a52100ff5bc50d7"
+checksum = "c445edc4c6f8329385507bddd65491bfa3293f0a46a785119a14e526710ab320"
dependencies = [
"background-jobs-actix",
"background-jobs-core",
@@ -492,19 +458,20 @@ dependencies = [
[[package]]
name = "background-jobs-actix"
-version = "0.8.0-alpha.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d012b9293806c777f806b537e04b5eec34ecd6eaf876c52792017695ce53262f"
+checksum = "d9696729d7b14c1682af423381744f317f7180136b4a2c8e4eca3a46e242f5fc"
dependencies = [
"actix-rt",
"anyhow",
+ "async-mutex",
"async-trait",
"background-jobs-core",
"chrono",
"log",
"num_cpus",
"rand",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"thiserror",
"tokio",
@@ -513,17 +480,17 @@ dependencies = [
[[package]]
name = "background-jobs-core"
-version = "0.8.0-alpha.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5efe91c019d7780d5a2fc2f92a15e1f95b84a761428e1d1972b7428634ebc7"
+checksum = "b68ae77ec4330e8ac4ea643ce2f25d1e8d81509eb659e671b18f68d91939d72d"
dependencies = [
"actix-rt",
"anyhow",
+ "async-mutex",
"async-trait",
"chrono",
- "futures",
"log",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"thiserror",
"tokio",
@@ -650,7 +617,7 @@ checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
dependencies = [
"num-integer",
"num-traits 0.2.12",
- "serde 1.0.115",
+ "serde 1.0.116",
"time 0.1.44",
]
@@ -687,7 +654,7 @@ dependencies = [
"lazy_static",
"nom",
"rust-ini",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde-hjson",
"serde_json",
"toml",
@@ -707,7 +674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
dependencies = [
"percent-encoding",
- "time 0.2.18",
+ "time 0.2.19",
"version_check",
]
@@ -774,7 +741,7 @@ dependencies = [
"config",
"crossbeam-queue",
"num_cpus",
- "serde 1.0.115",
+ "serde 1.0.116",
"tokio",
]
@@ -789,16 +756,16 @@ dependencies = [
"deadpool",
"futures",
"log",
- "serde 1.0.115",
+ "serde 1.0.116",
"tokio",
"tokio-postgres",
]
[[package]]
name = "derive_more"
-version = "0.99.9"
+version = "0.99.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76"
+checksum = "1dcfabdab475c16a93d669dddfc393027803e347d09663f524447f642fbb84ba"
dependencies = [
"proc-macro2",
"quote",
@@ -1044,9 +1011,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.1.14"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
dependencies = [
"cfg-if",
"libc",
@@ -1074,7 +1041,7 @@ dependencies = [
"indexmap",
"slab",
"tokio",
- "tokio-util 0.3.1",
+ "tokio-util",
"tracing",
]
@@ -1170,12 +1137,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",
"bytes",
"chrono",
@@ -1313,9 +1280,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.76"
+version = "0.2.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
+checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
[[package]]
name = "libm"
@@ -1396,7 +1363,7 @@ dependencies = [
"log",
"phf",
"phf_codegen",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_derive",
"serde_json",
"string_cache",
@@ -1454,11 +1421,12 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
[[package]]
name = "miniz_oxide"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
+checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
dependencies = [
"adler",
+ "autocfg 1.0.1",
]
[[package]]
@@ -1556,7 +1524,7 @@ dependencies = [
"num-iter",
"num-traits 0.2.12",
"rand",
- "serde 1.0.115",
+ "serde 1.0.116",
"smallvec",
"zeroize",
]
@@ -1780,7 +1748,7 @@ dependencies = [
"chrono",
"fallible-iterator",
"postgres-protocol",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"uuid",
]
@@ -1975,7 +1943,7 @@ dependencies = [
"rsa-magic-public-key",
"rsa-pem",
"ructe",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_json",
"sha2",
"structopt",
@@ -2170,9 +2138,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
[[package]]
name = "serde"
-version = "1.0.115"
+version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
+checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
dependencies = [
"serde_derive",
]
@@ -2192,9 +2160,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.115"
+version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
+checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
dependencies = [
"proc-macro2",
"quote",
@@ -2209,7 +2177,7 @@ checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
dependencies = [
"itoa",
"ryu",
- "serde 1.0.115",
+ "serde 1.0.116",
]
[[package]]
@@ -2229,7 +2197,7 @@ checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
dependencies = [
"dtoa",
"itoa",
- "serde 1.0.115",
+ "serde 1.0.116",
"url",
]
@@ -2359,7 +2327,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [
"proc-macro2",
"quote",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_derive",
"syn",
]
@@ -2373,7 +2341,7 @@ dependencies = [
"base-x",
"proc-macro2",
"quote",
- "serde 1.0.115",
+ "serde 1.0.116",
"serde_derive",
"serde_json",
"sha1",
@@ -2396,7 +2364,7 @@ dependencies = [
"new_debug_unreachable",
"phf_shared",
"precomputed-hash",
- "serde 1.0.115",
+ "serde 1.0.116",
]
[[package]]
@@ -2560,9 +2528,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12785163ae8a1cbb52a5db39af4a5baabd3fe49f07f76f952f89d7e89e5ce531"
+checksum = "80c1a1fd93112fc50b11c43a1def21f926be3c18884fad676ea879572da070a1"
dependencies = [
"const_fn",
"libc",
@@ -2642,7 +2610,7 @@ dependencies = [
"postgres-protocol",
"postgres-types",
"tokio",
- "tokio-util 0.3.1",
+ "tokio-util",
]
[[package]]
@@ -2657,20 +2625,6 @@ dependencies = [
"webpki",
]
-[[package]]
-name = "tokio-util"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
[[package]]
name = "tokio-util"
version = "0.3.1"
@@ -2691,7 +2645,7 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
dependencies = [
- "serde 1.0.115",
+ "serde 1.0.116",
]
[[package]]
@@ -2820,7 +2774,7 @@ dependencies = [
"idna",
"matches",
"percent-encoding",
- "serde 1.0.115",
+ "serde 1.0.116",
]
[[package]]
@@ -2836,7 +2790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
dependencies = [
"rand",
- "serde 1.0.115",
+ "serde 1.0.116",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 80b0890..790a576 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,14 +15,14 @@ build = "src/build.rs"
[dependencies]
anyhow = "1.0"
actix-rt = "1.1.1"
-actix-web = { version = "3.0.0-beta.1", features = ["rustls"] }
-actix-webfinger = "0.3.0-alpha.6"
+actix-web = { version = "3.0.1", default-features = false, features = ["rustls", "compress"] }
+actix-webfinger = "0.3.0"
activitystreams = "0.7.0-alpha.4"
activitystreams-ext = "0.1.0-alpha.2"
ammonia = "3.1.0"
async-mutex = "1.0.1"
async-trait = "0.1.24"
-background-jobs = "0.8.0-alpha.2"
+background-jobs = "0.8.0"
bytes = "0.5.4"
base64 = "0.12"
config = "0.10.1"
@@ -31,7 +31,7 @@ deadpool-postgres = "0.5.5"
dotenv = "0.15.0"
env_logger = "0.7.1"
futures = "0.3.4"
-http-signature-normalization-actix = { version = "0.4.0-alpha.3", default-features = false, features = ["sha-2"] }
+http-signature-normalization-actix = { version = "0.4.0", default-features = false, features = ["sha-2"] }
log = "0.4"
lru = "0.6.0"
mime = "0.3.16"
diff --git a/src/requests.rs b/src/requests.rs
index 319e5c2..9ae1f29 100644
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -28,7 +28,7 @@ impl Requests {
pub fn new(key_id: String, private_key: RSAPrivateKey, user_agent: String) -> Self {
Requests {
client: Rc::new(RefCell::new(
- Client::build()
+ Client::builder()
.header("User-Agent", user_agent.clone())
.finish(),
)),
@@ -45,7 +45,7 @@ impl Requests {
let count = self.consecutive_errors.fetch_add(1, Ordering::Relaxed);
if count + 1 >= self.error_limit {
warn!("{} consecutive errors, rebuilding http client", count);
- *self.client.borrow_mut() = Client::build()
+ *self.client.borrow_mut() = Client::builder()
.header("User-Agent", self.user_agent.clone())
.finish();
self.reset_err();