From 10f0b3b877a003df91fc3d914a57a5f400a33fee Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 1 Feb 2021 15:56:37 -0500 Subject: [PATCH 1/2] Trying to upgrade lemmys deps. --- Cargo.lock | 461 +++++++++++++++++++-------- Cargo.toml | 22 +- crates/api/Cargo.toml | 28 +- crates/apub/Cargo.toml | 32 +- crates/apub/src/activity_queue.rs | 4 +- crates/apub/src/inbox/mod.rs | 3 +- crates/db_queries/Cargo.toml | 10 +- crates/db_schema/Cargo.toml | 6 +- crates/db_views/Cargo.toml | 4 +- crates/db_views_actor/Cargo.toml | 2 +- crates/db_views_moderator/Cargo.toml | 2 +- crates/structs/Cargo.toml | 6 +- crates/utils/Cargo.toml | 28 +- crates/utils/src/email.rs | 8 +- crates/websocket/Cargo.toml | 14 +- 15 files changed, 407 insertions(+), 223 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 618ba83a7..853f7ed43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,13 +2,13 @@ # It is not intended for manual editing. [[package]] name = "activitystreams" -version = "0.7.0-alpha.9" +version = "0.7.0-alpha.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0bc65a417d0e6bb79922b4ddb40ae52c7eddb5fa87707c83e383c3013ae0c1e" +checksum = "fe7ceed015dfca322d3bcec3653909c77557e7e57df72e98cb8806e2c93cc919" dependencies = [ "chrono", "mime", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "thiserror", "url", @@ -21,7 +21,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e" dependencies = [ "activitystreams", - "serde 1.0.118", + "serde 1.0.123", "serde_json", ] @@ -45,7 +45,7 @@ dependencies = [ "pin-project 0.4.27", "smallvec", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", "trust-dns-proto", "trust-dns-resolver", ] @@ -63,7 +63,7 @@ dependencies = [ "log", "pin-project 0.4.27", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", ] [[package]] @@ -90,9 +90,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d031468a7859f71674e5531bd05137e0ea5de05ec9a917314330b88c582e2e0a" +checksum = "c51e8a9146c12fce92a6e4c24b8c4d9b05268130bfd8d61bc587e822c32ce689" dependencies = [ "actix-service", "actix-web", @@ -135,7 +135,7 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2", + "h2 0.2.7", "http", "httparse", "indexmap", @@ -148,7 +148,7 @@ dependencies = [ "pin-project 1.0.3", "rand 0.7.3", "regex", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "serde_urlencoded", "sha-1 0.9.2", @@ -176,7 +176,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] @@ -207,7 +207,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "mio", + "mio 0.6.23", "mio-uds", "num_cpus", "slab", @@ -320,7 +320,7 @@ dependencies = [ "pin-project 1.0.3", "regex", "rustls", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "serde_urlencoded", "socket2", @@ -399,9 +399,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" +checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" [[package]] name = "arrayvec" @@ -429,6 +429,18 @@ dependencies = [ "syn", ] +[[package]] +name = "atom_syndication" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5016bf52ff4f3ed28bf3ec1fed96b53daf4b137d5e6b9f97a8cfae7b57a3a2" +dependencies = [ + "chrono", + "derive_builder", + "diligent-date-parser", + "quick-xml", +] + [[package]] name = "atty" version = "0.2.14" @@ -466,7 +478,7 @@ dependencies = [ "percent-encoding", "rand 0.7.3", "rustls", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "serde_urlencoded", ] @@ -496,7 +508,7 @@ dependencies = [ "log", "num_cpus", "rand 0.7.3", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "thiserror", "tokio 0.2.24", @@ -515,7 +527,7 @@ dependencies = [ "async-trait", "chrono", "log", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "thiserror", "tokio 0.2.24", @@ -524,9 +536,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" dependencies = [ "addr2line", "cfg-if 1.0.0", @@ -646,11 +658,11 @@ dependencies = [ [[package]] name = "buf-min" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881e704e61d0fb41d7c6c9ae2bd790eb8c13dc974ae102fb98c788b4fdea4349" +checksum = "fa17aa1cf56bdd6bb30518767d00e58019d326f3f05d8c3e0730b549d332ea83" dependencies = [ - "bytes 0.6.0", + "bytes 0.5.6", ] [[package]] @@ -685,9 +697,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "0.6.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" [[package]] name = "bytestring" @@ -745,7 +757,7 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", - "serde 1.0.118", + "serde 1.0.123", "time 0.1.44", "winapi 0.3.9", ] @@ -800,7 +812,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom 5.1.2", - "serde 1.0.118", + "serde 1.0.123", "serde-hjson", ] @@ -1039,7 +1051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2812f0f63b6d3508fb7bfdb872c2dc2321ba938f5e0f4cb9751ec899e8b297c9" dependencies = [ "diesel", - "serde 1.0.118", + "serde 1.0.123", "serde_json", ] @@ -1071,6 +1083,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "diligent-date-parser" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37ea528f01b8bfca1f71bcd06a8e6c898bf8fdfbf24dd9dbc7fb49338ed6d84" +dependencies = [ + "chrono", +] + [[package]] name = "discard" version = "1.0.4" @@ -1202,9 +1223,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" +checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150" dependencies = [ "futures-channel", "futures-core", @@ -1217,9 +1238,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" +checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846" dependencies = [ "futures-core", "futures-sink", @@ -1227,15 +1248,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" +checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65" [[package]] name = "futures-executor" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" +checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" dependencies = [ "futures-core", "futures-task", @@ -1244,15 +1265,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" +checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500" [[package]] name = "futures-macro" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" +checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -1262,24 +1283,24 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" +checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6" [[package]] name = "futures-task" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" +checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86" dependencies = [ "once_cell", ] [[package]] name = "futures-util" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" +checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b" dependencies = [ "futures-channel", "futures-core", @@ -1288,7 +1309,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 1.0.3", + "pin-project-lite 0.2.4", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1376,7 +1397,27 @@ dependencies = [ "indexmap", "slab", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", + "tracing", + "tracing-futures", +] + +[[package]] +name = "h2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" +dependencies = [ + "bytes 1.0.1", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.1.1", + "tokio-util 0.6.3", "tracing", "tracing-futures", ] @@ -1424,11 +1465,11 @@ checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" [[package]] name = "http" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" +checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "fnv", "itoa", ] @@ -1443,6 +1484,16 @@ dependencies = [ "http", ] +[[package]] +name = "http-body" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +dependencies = [ + "bytes 1.0.1", + "http", +] + [[package]] name = "http-signature-normalization" version = "0.5.3" @@ -1483,7 +1534,7 @@ dependencies = [ "futures", "http", "http-signature-normalization", - "reqwest", + "reqwest 0.10.10", "sha2", "thiserror", "tokio 0.2.24", @@ -1517,9 +1568,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.2.7", "http", - "http-body", + "http-body 0.3.1", "httparse", "httpdate", "itoa", @@ -1531,6 +1582,30 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12219dc884514cb4a6a03737f4413c0e01c23a1b059b0156004b23f1e19dccbe" +dependencies = [ + "bytes 1.0.1", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.0", + "http", + "http-body 0.4.0", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.3", + "socket2", + "tokio 1.1.1", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper-tls" version = "0.4.3" @@ -1538,12 +1613,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.9", "native-tls", "tokio 0.2.24", "tokio-tls", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.0.1", + "hyper 0.14.2", + "native-tls", + "tokio 1.1.1", + "tokio-native-tls", +] + [[package]] name = "hyperx" version = "1.2.0" @@ -1646,9 +1734,9 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" [[package]] name = "itertools" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" dependencies = [ "either", ] @@ -1687,7 +1775,7 @@ dependencies = [ "base64 0.12.3", "pem", "ring", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "simple_asn1", ] @@ -1747,15 +1835,15 @@ dependencies = [ "lemmy_websocket", "log", "openssl", - "rand 0.8.1", - "reqwest", - "serde 1.0.118", + "rand 0.8.3", + "reqwest 0.11.0", + "serde 1.0.123", "serde_json", "sha2", "strum", "strum_macros", "thiserror", - "tokio 0.3.6", + "tokio 1.1.1", "url", "uuid", ] @@ -1794,15 +1882,15 @@ dependencies = [ "log", "openssl", "percent-encoding", - "rand 0.8.1", - "reqwest", - "serde 1.0.118", + "rand 0.8.3", + "reqwest 0.11.0", + "serde 1.0.123", "serde_json", "sha2", "strum", "strum_macros", "thiserror", - "tokio 0.3.6", + "tokio 1.1.1", "url", "uuid", ] @@ -1821,7 +1909,7 @@ dependencies = [ "lemmy_utils", "log", "regex", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "sha2", "strum", @@ -1836,7 +1924,7 @@ dependencies = [ "chrono", "diesel", "log", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "url", ] @@ -1849,7 +1937,7 @@ dependencies = [ "lemmy_db_queries", "lemmy_db_schema", "log", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] @@ -1859,7 +1947,7 @@ dependencies = [ "diesel", "lemmy_db_queries", "lemmy_db_schema", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] @@ -1869,7 +1957,7 @@ dependencies = [ "diesel", "lemmy_db_queries", "lemmy_db_schema", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] @@ -1904,13 +1992,13 @@ dependencies = [ "lemmy_websocket", "log", "openssl", - "reqwest", + "reqwest 0.11.0", "rss", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "sha2", "strum", - "tokio 0.3.6", + "tokio 1.1.1", "url", ] @@ -1928,7 +2016,7 @@ dependencies = [ "lemmy_db_views_moderator", "lemmy_utils", "log", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "url", ] @@ -1952,15 +2040,15 @@ dependencies = [ "log", "openssl", "percent-encoding", - "rand 0.8.1", + "rand 0.8.3", "regex", - "reqwest", - "serde 1.0.118", + "reqwest 0.11.0", + "serde 1.0.123", "serde_json", "strum", "strum_macros", "thiserror", - "tokio 0.3.6", + "tokio 1.1.1", "url", ] @@ -1978,20 +2066,20 @@ dependencies = [ "lemmy_structs", "lemmy_utils", "log", - "rand 0.8.1", - "reqwest", - "serde 1.0.118", + "rand 0.8.3", + "reqwest 0.11.0", + "serde 1.0.123", "serde_json", "strum", "strum_macros", - "tokio 0.3.6", + "tokio 1.1.1", ] [[package]] name = "lettre" -version = "0.10.0-alpha.4" +version = "0.10.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8c2fc7873920aca23647e5e86d44ff3f40bbc5a5efaab445c9eb0e001c9f71" +checksum = "34f3dd8d917156976a47ef421a2e771423d6da95e93696f1814e76768625c162" dependencies = [ "base64 0.13.0", "hostname", @@ -2003,9 +2091,9 @@ dependencies = [ "once_cell", "quoted_printable", "r2d2", - "rand 0.7.3", + "rand 0.8.3", "regex", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "uuid", ] @@ -2067,11 +2155,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -2191,12 +2279,25 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow", + "miow 0.2.2", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" +dependencies = [ + "libc", + "log", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-uds" version = "0.6.8" @@ -2205,7 +2306,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -2220,6 +2321,16 @@ dependencies = [ "ws2_32-sys", ] +[[package]] +name = "miow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +dependencies = [ + "socket2", + "winapi 0.3.9", +] + [[package]] name = "native-tls" version = "0.2.7" @@ -2281,6 +2392,15 @@ dependencies = [ "version_check 0.9.2", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -2354,9 +2474,9 @@ dependencies = [ [[package]] name = "object" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" @@ -2542,9 +2662,9 @@ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-project-lite" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36743d754ccdf9954c2e352ce2d4b106e024c814f6499c2dadff80da9a442d8" +checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" [[package]] name = "pin-utils" @@ -2614,9 +2734,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.17.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0" +checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" dependencies = [ "encoding_rs", "memchr", @@ -2669,9 +2789,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", @@ -2768,9 +2888,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" +checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" dependencies = [ "aho-corasick", "memchr", @@ -2780,9 +2900,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.21" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" +checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" [[package]] name = "remove_dir_all" @@ -2805,9 +2925,9 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.3.1", + "hyper 0.13.9", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -2816,9 +2936,8 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite 0.2.1", - "serde 1.0.118", - "serde_json", + "pin-project-lite 0.2.4", + "serde 1.0.123", "serde_urlencoded", "tokio 0.2.24", "tokio-tls", @@ -2829,6 +2948,41 @@ dependencies = [ "winreg 0.7.0", ] +[[package]] +name = "reqwest" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.1", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body 0.4.0", + "hyper 0.14.2", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.4", + "serde 1.0.123", + "serde_json", + "serde_urlencoded", + "tokio 1.1.1", + "tokio-native-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.7.0", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -2865,10 +3019,11 @@ dependencies = [ [[package]] name = "rss" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99979205510c60f80a119dedbabd0b8426517384edf205322f8bcd51796bcef9" +checksum = "02e70d6ae72f8a4333af8ce9dce58942020528430eb0d46ee2fcb5e8d4d16377" dependencies = [ + "atom_syndication", "derive_builder", "quick-xml", ] @@ -2994,9 +3149,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.118" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" dependencies = [ "serde_derive", ] @@ -3016,9 +3171,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" dependencies = [ "proc-macro2", "quote", @@ -3034,7 +3189,7 @@ dependencies = [ "indexmap", "itoa", "ryu", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] @@ -3055,7 +3210,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] @@ -3091,9 +3246,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" +checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -3194,7 +3349,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.118", + "serde 1.0.123", "serde_derive", "syn", ] @@ -3208,7 +3363,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.118", + "serde 1.0.123", "serde_derive", "serde_json", "sha1", @@ -3247,9 +3402,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" dependencies = [ "proc-macro2", "quote", @@ -3411,7 +3566,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-uds", "pin-project-lite 0.1.11", "signal-hook-registry", @@ -3421,12 +3576,26 @@ dependencies = [ [[package]] name = "tokio" -version = "0.3.6" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720ba21c25078711bf456d607987d95bce90f7c3bea5abe1db587862e7a1e87c" +checksum = "6714d663090b6b0acb0fa85841c6d66233d150cdb2602c8f9b8abb03370beb3f" dependencies = [ "autocfg", - "pin-project-lite 0.2.1", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.7", + "pin-project-lite 0.2.4", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio 1.1.1", ] [[package]] @@ -3466,6 +3635,20 @@ dependencies = [ "tokio 0.2.24", ] +[[package]] +name = "tokio-util" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.4", + "tokio 1.1.1", +] + [[package]] name = "tower-service" version = "0.3.0" @@ -3480,7 +3663,7 @@ checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.1", + "pin-project-lite 0.2.4", "tracing-core", ] @@ -3644,24 +3827,24 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde 1.0.118", + "serde 1.0.123", ] [[package]] name = "uuid" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "rand 0.7.3", - "serde 1.0.118", + "getrandom 0.2.1", + "serde 1.0.123", ] [[package]] name = "v_escape" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccca9e73c678b882900cbaec16dae4d3662ace5a17774ac45af04e0f3988fafa" +checksum = "f3e0ab5fab1db278a9413d2ea794cb66f471f898c5b020c3c394f6447625d9d4" dependencies = [ "buf-min", "v_escape_derive", @@ -3681,9 +3864,9 @@ dependencies = [ [[package]] name = "v_htmlescape" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db00c903248abee8499af60bf20d242e7882335bbbffd2614915184cbb207402" +checksum = "1f9a8af610ad6f7fc9989c9d2590d9764bc61f294884e9ee93baa58795174572" dependencies = [ "cfg-if 1.0.0", "v_escape", @@ -3736,7 +3919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.118", + "serde 1.0.123", "serde_json", "wasm-bindgen-macro", ] diff --git a/Cargo.toml b/Cargo.toml index bd565c7a1..88d190842 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,27 +34,27 @@ lemmy_websocket = { path = "./crates/websocket" } diesel = "1.4.5" diesel_migrations = "1.4.0" chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.118", features = ["derive"] } +serde = { version = "1.0.123", features = ["derive"] } actix = "0.10.0" actix-web = { version = "3.3.2", default-features = false, features = ["rustls"] } -actix-files = { version = "0.4.1", default-features = false } +actix-files = { version = "0.5.0", default-features = false } actix-web-actors = { version = "3.0.0", default-features = false } awc = { version = "2.0.3", default-features = false } -log = "0.4.11" +log = "0.4.14" env_logger = "0.8.2" strum = "0.20.0" lazy_static = "1.4.0" -rss = "1.9.0" +rss = "1.10.0" url = { version = "2.2.0", features = ["serde"] } -openssl = "0.10.31" +openssl = "0.10.32" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } -tokio = "0.3.6" -sha2 = "0.9.2" -anyhow = "1.0.36" -reqwest = { version = "0.10.10", features = ["json"] } -activitystreams = "0.7.0-alpha.8" +tokio = "1.1.1" +sha2 = "0.9.3" +anyhow = "1.0.38" +reqwest = { version = "0.11.0", features = ["json"] } +activitystreams = "0.7.0-alpha.10" actix-rt = { version = "1.1.1", default-features = false } -serde_json = { version = "1.0.60", features = ["preserve_order"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } clokwerk = "0.3.4" [dev-dependencies.cargo-husky] diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 10612c385..5a0e384f8 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -21,31 +21,31 @@ lemmy_websocket = { path = "../websocket" } diesel = "1.4.5" bcrypt = "0.9.0" chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } -serde = { version = "1.0.118", features = ["derive"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } +serde = { version = "1.0.123", features = ["derive"] } actix = "0.10.0" actix-web = { version = "3.3.2", default-features = false } actix-rt = { version = "1.1.1", default-features = false } awc = { version = "2.0.3", default-features = false } -log = "0.4.11" -rand = "0.8.0" +log = "0.4.14" +rand = "0.8.3" strum = "0.20.0" strum_macros = "0.20.1" jsonwebtoken = "7.2.0" lazy_static = "1.4.0" url = { version = "2.2.0", features = ["serde"] } -openssl = "0.10.31" -http = "0.2.2" +openssl = "0.10.32" +http = "0.2.3" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } base64 = "0.13.0" -tokio = "0.3.6" -futures = "0.3.8" -itertools = "0.9.0" -uuid = { version = "0.8.1", features = ["serde", "v4"] } -sha2 = "0.9.2" +tokio = "1.1.1" +futures = "0.3.12" +itertools = "0.10.0" +uuid = { version = "0.8.2", features = ["serde", "v4"] } +sha2 = "0.9.3" async-trait = "0.1.42" captcha = "0.0.8" -anyhow = "1.0.36" -thiserror = "1.0.22" +anyhow = "1.0.38" +thiserror = "1.0.23" background-jobs = "0.8.0" -reqwest = { version = "0.10.10", features = ["json"] } +reqwest = { version = "0.11.0", features = ["json"] } diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml index e1f4ea64d..d7e6ba8d4 100644 --- a/crates/apub/Cargo.toml +++ b/crates/apub/Cargo.toml @@ -17,36 +17,36 @@ lemmy_db_views_actor = { path = "../db_views_actor" } lemmy_structs = { path = "../structs" } lemmy_websocket = { path = "../websocket" } diesel = "1.4.5" -activitystreams = "0.7.0-alpha.8" +activitystreams = "0.7.0-alpha.10" activitystreams-ext = "0.1.0-alpha.2" bcrypt = "0.9.0" chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } -serde = { version = "1.0.118", features = ["derive"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } +serde = { version = "1.0.123", features = ["derive"] } actix = "0.10.0" actix-web = { version = "3.3.2", default-features = false } actix-rt = { version = "1.1.1", default-features = false } awc = { version = "2.0.3", default-features = false } -log = "0.4.11" -rand = "0.8.0" +log = "0.4.14" +rand = "0.8.3" strum = "0.20.0" strum_macros = "0.20.1" lazy_static = "1.4.0" url = { version = "2.2.0", features = ["serde"] } percent-encoding = "2.1.0" -openssl = "0.10.31" -http = "0.2.2" +openssl = "0.10.32" +http = "0.2.3" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } http-signature-normalization-reqwest = { version = "0.1.3", default-features = false, features = ["sha-2"] } base64 = "0.13.0" -tokio = "0.3.6" -futures = "0.3.8" -itertools = "0.9.0" -uuid = { version = "0.8.1", features = ["serde", "v4"] } -sha2 = "0.9.2" +tokio = "1.1.1" +futures = "0.3.12" +itertools = "0.10.0" +uuid = { version = "0.8.2", features = ["serde", "v4"] } +sha2 = "0.9.3" async-trait = "0.1.42" -anyhow = "1.0.36" -thiserror = "1.0.22" +anyhow = "1.0.38" +thiserror = "1.0.23" background-jobs = "0.8.0" -reqwest = { version = "0.10.10", features = ["json"] } -backtrace = "0.3.55" +reqwest = { version = "0.11.0", features = ["json"] } +backtrace = "0.3.56" diff --git a/crates/apub/src/activity_queue.rs b/crates/apub/src/activity_queue.rs index d7246384a..1e1a6a5a7 100644 --- a/crates/apub/src/activity_queue.rs +++ b/crates/apub/src/activity_queue.rs @@ -26,8 +26,8 @@ use lemmy_utils::{location_info, settings::Settings, LemmyError}; use lemmy_websocket::LemmyContext; use log::{debug, warn}; use reqwest::Client; -use serde::{export::fmt::Debug, Deserialize, Serialize}; -use std::{collections::BTreeMap, env, future::Future, pin::Pin}; +use serde::{Deserialize, Serialize}; +use std::{collections::BTreeMap, env, fmt::Debug, future::Future, pin::Pin}; use url::Url; /// Sends a local activity to a single, remote actor. diff --git a/crates/apub/src/inbox/mod.rs b/crates/apub/src/inbox/mod.rs index 65e476e51..1e3574bcc 100644 --- a/crates/apub/src/inbox/mod.rs +++ b/crates/apub/src/inbox/mod.rs @@ -17,7 +17,8 @@ use lemmy_db_schema::source::{activity::Activity, community::Community, user::Us use lemmy_structs::blocking; use lemmy_utils::{location_info, settings::Settings, LemmyError}; use lemmy_websocket::LemmyContext; -use serde::{export::fmt::Debug, Serialize}; +use serde::Serialize; +use std::fmt::Debug; use url::Url; pub mod community_inbox; diff --git a/crates/db_queries/Cargo.toml b/crates/db_queries/Cargo.toml index 42e159fba..a25b80ffb 100644 --- a/crates/db_queries/Cargo.toml +++ b/crates/db_queries/Cargo.toml @@ -13,14 +13,14 @@ lemmy_db_schema = { path = "../db_schema" } diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] } diesel_migrations = "1.4.0" chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.118", features = ["derive"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } +serde = { version = "1.0.123", features = ["derive"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } strum = "0.20.0" strum_macros = "0.20.1" -log = "0.4.11" -sha2 = "0.9.2" +log = "0.4.14" +sha2 = "0.9.3" url = { version = "2.2.0", features = ["serde"] } lazy_static = "1.4.0" -regex = "1.4.2" +regex = "1.4.3" bcrypt = "0.9.0" diesel_json = "0.1.1" diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml index 99b7399b1..a175f80e4 100644 --- a/crates/db_schema/Cargo.toml +++ b/crates/db_schema/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] } chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.118", features = ["derive"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } -log = "0.4.11" +serde = { version = "1.0.123", features = ["derive"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } +log = "0.4.14" url = { version = "2.2.0", features = ["serde"] } diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml index da942b861..70be2fb52 100644 --- a/crates/db_views/Cargo.toml +++ b/crates/db_views/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" lemmy_db_queries = { path = "../db_queries" } lemmy_db_schema = { path = "../db_schema" } diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] } -serde = { version = "1.0.118", features = ["derive"] } -log = "0.4.11" +serde = { version = "1.0.123", features = ["derive"] } +log = "0.4.14" diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml index a0773181c..8e86d4c0a 100644 --- a/crates/db_views_actor/Cargo.toml +++ b/crates/db_views_actor/Cargo.toml @@ -7,4 +7,4 @@ edition = "2018" lemmy_db_queries = { path = "../db_queries" } lemmy_db_schema = { path = "../db_schema" } diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] } -serde = { version = "1.0.118", features = ["derive"] } +serde = { version = "1.0.123", features = ["derive"] } diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml index 460181980..aef6abdc3 100644 --- a/crates/db_views_moderator/Cargo.toml +++ b/crates/db_views_moderator/Cargo.toml @@ -7,4 +7,4 @@ edition = "2018" lemmy_db_queries = { path = "../db_queries" } lemmy_db_schema = { path = "../db_schema" } diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] } -serde = { version = "1.0.118", features = ["derive"] } +serde = { version = "1.0.123", features = ["derive"] } diff --git a/crates/structs/Cargo.toml b/crates/structs/Cargo.toml index 75d107c8e..f895a8c95 100644 --- a/crates/structs/Cargo.toml +++ b/crates/structs/Cargo.toml @@ -15,10 +15,10 @@ lemmy_db_views_moderator = { path = "../db_views_moderator" } lemmy_db_views_actor = { path = "../db_views_actor" } lemmy_db_schema = { path = "../db_schema" } lemmy_utils = { path = "../utils" } -serde = { version = "1.0.118", features = ["derive"] } -log = "0.4.11" +serde = { version = "1.0.123", features = ["derive"] } +log = "0.4.14" diesel = "1.4.5" actix-web = "3.3.2" chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } url = "2.2.0" diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 052ceb206..bc051b840 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -8,28 +8,28 @@ name = "lemmy_utils" path = "src/lib.rs" [dependencies] -regex = "1.4.2" +regex = "1.4.3" config = { version = "0.10.1", default-features = false, features = ["hjson"] } chrono = { version = "0.4.19", features = ["serde"] } -lettre = "0.10.0-alpha.4" -log = "0.4.11" -itertools = "0.9.0" -rand = "0.8.0" +lettre = "0.10.0-alpha.5" +log = "0.4.14" +itertools = "0.10.0" +rand = "0.8.3" percent-encoding = "2.1.0" -serde = { version = "1.0.118", features = ["derive"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } -thiserror = "1.0.22" +serde = { version = "1.0.123", features = ["derive"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } +thiserror = "1.0.23" comrak = { version = "0.9.0", default-features = false } lazy_static = "1.4.0" -openssl = "0.10.31" +openssl = "0.10.32" url = { version = "2.2.0", features = ["serde"] } actix-web = { version = "3.3.2", default-features = false, features = ["rustls"] } actix-rt = { version = "1.1.1", default-features = false } -anyhow = "1.0.36" -reqwest = { version = "0.10.10", features = ["json"] } -tokio = { version = "0.3.6", features = ["sync"] } +anyhow = "1.0.38" +reqwest = { version = "0.11.0", features = ["json"] } +tokio = { version = "1.1.1", features = ["sync"] } strum = "0.20.0" strum_macros = "0.20.1" -futures = "0.3.8" +futures = "0.3.12" diesel = "1.4.5" -http = "0.2.2" +http = "0.2.3" diff --git a/crates/utils/src/email.rs b/crates/utils/src/email.rs index 2736a56c9..8e61500c0 100644 --- a/crates/utils/src/email.rs +++ b/crates/utils/src/email.rs @@ -48,23 +48,23 @@ pub fn send_email( MultiPart::mixed().multipart( MultiPart::alternative() .singlepart( - SinglePart::eight_bit() + SinglePart::builder() .header(header::ContentType( "text/plain; charset=utf8" .parse() .expect("email could not parse header"), )) - .body(html), + .body(html.to_string()), ) .multipart( MultiPart::related().singlepart( - SinglePart::eight_bit() + SinglePart::builder() .header(header::ContentType( "text/html; charset=utf8" .parse() .expect("email could not parse header"), )) - .body(html), + .body(html.to_string()), ), ), ), diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml index 134fa0db1..4434233f6 100644 --- a/crates/websocket/Cargo.toml +++ b/crates/websocket/Cargo.toml @@ -13,16 +13,16 @@ lemmy_utils = { path = "../utils" } lemmy_structs = { path = "../structs" } lemmy_db_queries = { path = "../db_queries" } lemmy_db_schema = { path = "../db_schema" } -reqwest = { version = "0.10.10", features = ["json"] } -log = "0.4.11" -rand = "0.8.0" -serde = { version = "1.0.118", features = ["derive"] } -serde_json = { version = "1.0.60", features = ["preserve_order"] } +reqwest = { version = "0.11.0", features = ["json"] } +log = "0.4.14" +rand = "0.8.3" +serde = { version = "1.0.123", features = ["derive"] } +serde_json = { version = "1.0.61", features = ["preserve_order"] } actix = "0.10.0" -anyhow = "1.0.36" +anyhow = "1.0.38" diesel = "1.4.5" background-jobs = "0.8.0" -tokio = "0.3.6" +tokio = "1.1.1" strum = "0.20.0" strum_macros = "0.20.1" chrono = { version = "0.4.19", features = ["serde"] } From 1857f02af859566871c6f0e586da1457b222d8b6 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 1 Feb 2021 21:54:23 -0500 Subject: [PATCH 2/2] Moving back tokio and reqwest. --- Cargo.lock | 471 +++++++++++++----------------------- Cargo.toml | 4 +- crates/api/Cargo.toml | 4 +- crates/apub/Cargo.toml | 4 +- crates/utils/Cargo.toml | 4 +- crates/websocket/Cargo.toml | 4 +- 6 files changed, 178 insertions(+), 313 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 853f7ed43..c6b9a0d91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,8 +44,8 @@ dependencies = [ "parking_lot", "pin-project 0.4.27", "smallvec", - "tokio 0.2.24", - "tokio-util 0.3.1", + "tokio 0.2.25", + "tokio-util", "trust-dns-proto", "trust-dns-resolver", ] @@ -62,8 +62,8 @@ dependencies = [ "futures-sink", "log", "pin-project 0.4.27", - "tokio 0.2.24", - "tokio-util 0.3.1", + "tokio 0.2.25", + "tokio-util", ] [[package]] @@ -135,7 +135,7 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2 0.2.7", + "h2", "http", "httparse", "indexmap", @@ -145,15 +145,15 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project 1.0.3", + "pin-project 1.0.4", "rand 0.7.3", "regex", "serde 1.0.123", "serde_json", "serde_urlencoded", - "sha-1 0.9.2", + "sha-1 0.9.3", "slab", - "time 0.2.23", + "time 0.2.25", ] [[package]] @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd1f7dbda1645bf7da33554db60891755f6c01c1b2169e2f4c492098d30c235" +checksum = "b8be584b3b6c705a18eabc11c4059cf83b255bdd8511673d1d569f4ce40c69de" dependencies = [ "bytestring", "http", @@ -191,7 +191,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] @@ -207,7 +207,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "mio 0.6.23", + "mio", "mio-uds", "num_cpus", "slab", @@ -317,14 +317,14 @@ dependencies = [ "fxhash", "log", "mime", - "pin-project 1.0.3", + "pin-project 1.0.4", "regex", "rustls", "serde 1.0.123", "serde_json", "serde_urlencoded", "socket2", - "time 0.2.23", + "time 0.2.25", "tinyvec", "url", ] @@ -388,6 +388,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + [[package]] name = "aho-corasick" version = "0.7.15" @@ -495,9 +501,9 @@ dependencies = [ [[package]] name = "background-jobs-actix" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9696729d7b14c1682af423381744f317f7180136b4a2c8e4eca3a46e242f5fc" +checksum = "5a0caa1f592d2bcfde1e3b38db933215320e2402e75dc60afbfedbf59b831a74" dependencies = [ "actix-rt", "anyhow", @@ -511,7 +517,7 @@ dependencies = [ "serde 1.0.123", "serde_json", "thiserror", - "tokio 0.2.24", + "tokio 0.2.25", "uuid", ] @@ -530,7 +536,7 @@ dependencies = [ "serde 1.0.123", "serde_json", "thiserror", - "tokio 0.2.24", + "tokio 0.2.25", "uuid", ] @@ -574,7 +580,7 @@ checksum = "a4d0faafe9e089674fc3efdb311ff5253d445c79d85d1d28bd3ace76d45e7164" dependencies = [ "base64 0.13.0", "blowfish", - "getrandom 0.2.1", + "getrandom 0.2.2", ] [[package]] @@ -667,9 +673,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9" [[package]] name = "byte-tools" @@ -679,15 +685,15 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41aa2ec95ca3b5c54cf73c91acf06d24f4495d5f1b1c12506ae3483d646177ac" +checksum = "5a4bad0c5981acc24bc09e532f35160f952e35422603f0563cd7a73c2c2e65a0" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" [[package]] name = "bytes" @@ -703,11 +709,11 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" [[package]] name = "bytestring" -version = "0.1.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" +checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", ] [[package]] @@ -829,7 +835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" dependencies = [ "percent-encoding", - "time 0.2.23", + "time 0.2.25", "version_check 0.9.2", ] @@ -1157,10 +1163,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] -name = "flate2" -version = "1.0.19" +name = "fallible_collections" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" +checksum = "74bebf0efe2e883c1619c455e3f1764333064694ebd5125d2faddabfb5963186" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "flate2" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -1357,9 +1372,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1396,28 +1411,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 0.2.24", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - -[[package]] -name = "h2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" -dependencies = [ - "bytes 1.0.1", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 1.1.1", - "tokio-util 0.6.3", + "tokio 0.2.25", + "tokio-util", "tracing", "tracing-futures", ] @@ -1427,6 +1422,9 @@ name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -1439,9 +1437,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] @@ -1484,16 +1482,6 @@ dependencies = [ "http", ] -[[package]] -name = "http-body" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" -dependencies = [ - "bytes 1.0.1", - "http", -] - [[package]] name = "http-signature-normalization" version = "0.5.3" @@ -1534,17 +1522,17 @@ dependencies = [ "futures", "http", "http-signature-normalization", - "reqwest 0.10.10", + "reqwest", "sha2", "thiserror", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" [[package]] name = "httpdate" @@ -1554,9 +1542,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "humantime" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -1568,39 +1556,15 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.2.7", + "h2", "http", - "http-body 0.3.1", + "http-body", "httparse", "httpdate", "itoa", - "pin-project 1.0.3", + "pin-project 1.0.4", "socket2", - "tokio 0.2.24", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12219dc884514cb4a6a03737f4413c0e01c23a1b059b0156004b23f1e19dccbe" -dependencies = [ - "bytes 1.0.1", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.0", - "http", - "http-body 0.4.0", - "httparse", - "httpdate", - "itoa", - "pin-project 1.0.3", - "socket2", - "tokio 1.1.1", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -1613,38 +1577,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper 0.13.9", + "hyper", "native-tls", - "tokio 0.2.24", + "tokio 0.2.25", "tokio-tls", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.0.1", - "hyper 0.14.2", - "native-tls", - "tokio 1.1.1", - "tokio-native-tls", -] - [[package]] name = "hyperx" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adce67e2c21cd95288ae3d9f2bbb2762cf17c03744628d49679f315ed1e2e58" +checksum = "82566a1ace7f56f604d83b7b2c259c78e243d99c565f23d7b4ae34466442c5a2" dependencies = [ "base64 0.13.0", - "bytes 0.5.6", + "bytes 1.0.1", "http", "httparse", "httpdate", "language-tags", - "log", "mime", "percent-encoding", "unicase", @@ -1749,19 +1699,18 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jpeg-decoder" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" dependencies = [ - "byteorder", "rayon", ] [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "5cfb73131c35423a367daf8cbd24100af0d077668c8c2943f0e7dd775fef0f65" dependencies = [ "wasm-bindgen", ] @@ -1836,14 +1785,14 @@ dependencies = [ "log", "openssl", "rand 0.8.3", - "reqwest 0.11.0", + "reqwest", "serde 1.0.123", "serde_json", "sha2", "strum", "strum_macros", "thiserror", - "tokio 1.1.1", + "tokio 0.3.7", "url", "uuid", ] @@ -1883,14 +1832,14 @@ dependencies = [ "openssl", "percent-encoding", "rand 0.8.3", - "reqwest 0.11.0", + "reqwest", "serde 1.0.123", "serde_json", "sha2", "strum", "strum_macros", "thiserror", - "tokio 1.1.1", + "tokio 0.3.7", "url", "uuid", ] @@ -1992,13 +1941,13 @@ dependencies = [ "lemmy_websocket", "log", "openssl", - "reqwest 0.11.0", + "reqwest", "rss", "serde 1.0.123", "serde_json", "sha2", "strum", - "tokio 1.1.1", + "tokio 0.3.7", "url", ] @@ -2042,13 +1991,13 @@ dependencies = [ "percent-encoding", "rand 0.8.3", "regex", - "reqwest 0.11.0", + "reqwest", "serde 1.0.123", "serde_json", "strum", "strum_macros", "thiserror", - "tokio 1.1.1", + "tokio 0.3.7", "url", ] @@ -2067,12 +2016,12 @@ dependencies = [ "lemmy_utils", "log", "rand 0.8.3", - "reqwest 0.11.0", + "reqwest", "serde 1.0.123", "serde_json", "strum", "strum_macros", - "tokio 1.1.1", + "tokio 0.3.7", ] [[package]] @@ -2087,7 +2036,7 @@ dependencies = [ "idna", "mime", "native-tls", - "nom 6.0.1", + "nom 6.1.0", "once_cell", "quoted_printable", "r2d2", @@ -2113,9 +2062,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.81" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff" [[package]] name = "linked-hash-map" @@ -2129,9 +2078,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" @@ -2144,10 +2093,11 @@ dependencies = [ [[package]] name = "lodepng" -version = "3.2.2" +version = "3.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6eb909184223b89c76d66b80199b7ad4163aebb2519244e6ebac8ba74e67eab" +checksum = "11443d177d97dc468ee5cc956769bbdeb4c20707d443c62dfd8b473505365613" dependencies = [ + "fallible_collections", "flate2", "libc", "rgb", @@ -2168,7 +2118,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" dependencies = [ - "linked-hash-map 0.5.3", + "linked-hash-map 0.5.4", ] [[package]] @@ -2279,25 +2229,12 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.2", + "miow", "net2", "slab", "winapi 0.2.8", ] -[[package]] -name = "mio" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" -dependencies = [ - "libc", - "log", - "miow 0.3.6", - "ntapi", - "winapi 0.3.9", -] - [[package]] name = "mio-uds" version = "0.6.8" @@ -2306,7 +2243,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio 0.6.23", + "mio", ] [[package]] @@ -2321,16 +2258,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" -dependencies = [ - "socket2", - "winapi 0.3.9", -] - [[package]] name = "native-tls" version = "0.2.7" @@ -2383,24 +2310,15 @@ dependencies = [ [[package]] name = "nom" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0" +checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1" dependencies = [ "bitvec", "memchr", "version_check 0.9.2", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -2549,7 +2467,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi 0.3.9", ] @@ -2625,11 +2543,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a83804639aad6ba65345661744708855f9fbcb71176ea8d28d05aeb11d975e7" +checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2" dependencies = [ - "pin-project-internal 1.0.3", + "pin-project-internal 1.0.4", ] [[package]] @@ -2645,9 +2563,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bcc46b8f73443d15bc1c5fecbb315718491fa9187fa483f0e359323cde8b3a" +checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71" dependencies = [ "proc-macro2", "quote", @@ -2713,9 +2631,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" @@ -2834,7 +2752,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" dependencies = [ - "getrandom 0.2.1", + "getrandom 0.2.2", ] [[package]] @@ -2886,6 +2804,15 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +[[package]] +name = "redox_syscall" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +dependencies = [ + "bitflags", +] + [[package]] name = "regex" version = "1.4.3" @@ -2925,9 +2852,9 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body 0.3.1", - "hyper 0.13.9", - "hyper-tls 0.4.3", + "http-body", + "hyper", + "hyper-tls", "ipnet", "js-sys", "lazy_static", @@ -2938,44 +2865,10 @@ dependencies = [ "percent-encoding", "pin-project-lite 0.2.4", "serde 1.0.123", - "serde_urlencoded", - "tokio 0.2.24", - "tokio-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - -[[package]] -name = "reqwest" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de" -dependencies = [ - "base64 0.13.0", - "bytes 1.0.1", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body 0.4.0", - "hyper 0.14.2", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite 0.2.4", - "serde 1.0.123", "serde_json", "serde_urlencoded", - "tokio 1.1.1", - "tokio-native-tls", + "tokio 0.2.25", + "tokio-tls", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -3004,9 +2897,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.19" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", @@ -3227,9 +3120,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" +checksum = "f4b312c3731e3fe78a185e6b9b911a7aa715b8e31cce117975219aab2acf285d" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -3291,9 +3184,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -3419,14 +3312,14 @@ checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.3", + "redox_syscall 0.2.4", "remove_dir_all", "winapi 0.3.9", ] @@ -3462,11 +3355,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "d8208a331e1cb318dd5bd76951d2b8fc48ca38a69f5f4e4af1b6a9f8c6236915" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -3502,9 +3395,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" +checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7" dependencies = [ "const_fn", "libc", @@ -3540,9 +3433,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -3555,9 +3448,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ "bytes 0.5.6", "fnv", @@ -3566,7 +3459,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio 0.6.23", + "mio", "mio-uds", "pin-project-lite 0.1.11", "signal-hook-registry", @@ -3576,28 +3469,14 @@ dependencies = [ [[package]] name = "tokio" -version = "1.1.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6714d663090b6b0acb0fa85841c6d66233d150cdb2602c8f9b8abb03370beb3f" +checksum = "46409491c9375a693ce7032101970a54f8a2010efb77e13f70788f0d84489e39" dependencies = [ "autocfg", - "bytes 1.0.1", - "libc", - "memchr", - "mio 0.7.7", "pin-project-lite 0.2.4", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio 1.1.1", -] - [[package]] name = "tokio-rustls" version = "0.14.1" @@ -3606,7 +3485,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio 0.2.24", + "tokio 0.2.25", "webpki", ] @@ -3617,7 +3496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] @@ -3632,28 +3511,14 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.11", - "tokio 0.2.24", -] - -[[package]] -name = "tokio-util" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b" -dependencies = [ - "bytes 1.0.1", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.2.4", - "tokio 1.1.1", + "tokio 0.2.25", ] [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" @@ -3702,7 +3567,7 @@ dependencies = [ "rand 0.7.3", "smallvec", "thiserror", - "tokio 0.2.24", + "tokio 0.2.25", "url", ] @@ -3722,7 +3587,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio 0.2.24", + "tokio 0.2.25", "trust-dns-proto", ] @@ -3836,7 +3701,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.1", + "getrandom 0.2.2", "serde 1.0.123", ] @@ -3914,9 +3779,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be" dependencies = [ "cfg-if 1.0.0", "serde 1.0.123", @@ -3926,9 +3791,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "7bc45447f0d4573f3d65720f636bbcc3dd6ce920ed704670118650bcd47764c7" dependencies = [ "bumpalo", "lazy_static", @@ -3941,9 +3806,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" +checksum = "3de431a2910c86679c34283a33f66f4e4abd7e0aec27b6669060148872aadf94" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3953,9 +3818,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "3b8853882eef39593ad4174dd26fc9865a64e84026d223f63bb2c42affcbba2c" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3963,9 +3828,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385" dependencies = [ "proc-macro2", "quote", @@ -3976,15 +3841,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64" [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3" dependencies = [ "js-sys", "wasm-bindgen", @@ -4011,9 +3876,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2bb9fc8309084dd7cd651336673844c1d47f8ef6d2091ec160b27f5c4aa277" +checksum = "4a32b378380f4e9869b22f0b5177c68a5519f03b3454fde0b291455ddbae266c" [[package]] name = "widestring" diff --git a/Cargo.toml b/Cargo.toml index 88d190842..8df7e8048 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,10 +48,10 @@ rss = "1.10.0" url = { version = "2.2.0", features = ["serde"] } openssl = "0.10.32" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } -tokio = "1.1.1" +tokio = "0.3.6" sha2 = "0.9.3" anyhow = "1.0.38" -reqwest = { version = "0.11.0", features = ["json"] } +reqwest = { version = "0.10.10", features = ["json"] } activitystreams = "0.7.0-alpha.10" actix-rt = { version = "1.1.1", default-features = false } serde_json = { version = "1.0.61", features = ["preserve_order"] } diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 5a0e384f8..37968ae94 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -38,7 +38,7 @@ openssl = "0.10.32" http = "0.2.3" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } base64 = "0.13.0" -tokio = "1.1.1" +tokio = "0.3.6" futures = "0.3.12" itertools = "0.10.0" uuid = { version = "0.8.2", features = ["serde", "v4"] } @@ -48,4 +48,4 @@ captcha = "0.0.8" anyhow = "1.0.38" thiserror = "1.0.23" background-jobs = "0.8.0" -reqwest = { version = "0.11.0", features = ["json"] } +reqwest = { version = "0.10.10", features = ["json"] } diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml index d7e6ba8d4..f2ad96838 100644 --- a/crates/apub/Cargo.toml +++ b/crates/apub/Cargo.toml @@ -39,7 +39,7 @@ http = "0.2.3" http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] } http-signature-normalization-reqwest = { version = "0.1.3", default-features = false, features = ["sha-2"] } base64 = "0.13.0" -tokio = "1.1.1" +tokio = "0.3.6" futures = "0.3.12" itertools = "0.10.0" uuid = { version = "0.8.2", features = ["serde", "v4"] } @@ -48,5 +48,5 @@ async-trait = "0.1.42" anyhow = "1.0.38" thiserror = "1.0.23" background-jobs = "0.8.0" -reqwest = { version = "0.11.0", features = ["json"] } +reqwest = { version = "0.10.10", features = ["json"] } backtrace = "0.3.56" diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index bc051b840..35df30649 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -26,8 +26,8 @@ url = { version = "2.2.0", features = ["serde"] } actix-web = { version = "3.3.2", default-features = false, features = ["rustls"] } actix-rt = { version = "1.1.1", default-features = false } anyhow = "1.0.38" -reqwest = { version = "0.11.0", features = ["json"] } -tokio = { version = "1.1.1", features = ["sync"] } +reqwest = { version = "0.10.10", features = ["json"] } +tokio = { version = "0.3.6", features = ["sync"] } strum = "0.20.0" strum_macros = "0.20.1" futures = "0.3.12" diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml index 4434233f6..0329cef13 100644 --- a/crates/websocket/Cargo.toml +++ b/crates/websocket/Cargo.toml @@ -13,7 +13,7 @@ lemmy_utils = { path = "../utils" } lemmy_structs = { path = "../structs" } lemmy_db_queries = { path = "../db_queries" } lemmy_db_schema = { path = "../db_schema" } -reqwest = { version = "0.11.0", features = ["json"] } +reqwest = { version = "0.10.10", features = ["json"] } log = "0.4.14" rand = "0.8.3" serde = { version = "1.0.123", features = ["derive"] } @@ -22,7 +22,7 @@ actix = "0.10.0" anyhow = "1.0.38" diesel = "1.4.5" background-jobs = "0.8.0" -tokio = "1.1.1" +tokio = "0.3.6" strum = "0.20.0" strum_macros = "0.20.1" chrono = { version = "0.4.19", features = ["serde"] }