From 6015ef045d429a48171c564f19d94d1ae13d20d7 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 20 Dec 2024 17:20:16 -0500 Subject: [PATCH] Running cargo-features-manager prune. (#5274) - Context #5273 --- Cargo.lock | 73 +++++++++++----------------- Cargo.toml | 13 ++--- crates/api_common/Cargo.toml | 4 +- crates/db_schema/Cargo.toml | 6 +-- crates/db_views_actor/Cargo.toml | 4 +- crates/db_views_moderator/Cargo.toml | 4 +- crates/federate/Cargo.toml | 2 +- crates/utils/Cargo.toml | 7 ++- 8 files changed, 46 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7215d79f..10f629cd9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -460,9 +460,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" dependencies = [ "flate2", "futures-core", @@ -495,15 +495,15 @@ dependencies = [ [[package]] name = "atom_syndication" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3a5ed3201df5658d1aa45060c5a57dc9dba8a8ada20d696d67cb0c479ee043" +checksum = "3ee79fb83c725eae67b55218870813d2fc39fd85e4f1583848ef9f4f823cfe7c" dependencies = [ "chrono", "derive_builder", "diligent-date-parser", "never", - "quick-xml 0.36.1", + "quick-xml 0.37.1", ] [[package]] @@ -514,21 +514,20 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-lc-rs" -version = "1.9.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" dependencies = [ "aws-lc-sys", - "mirai-annotations", "paste", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.21.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234314bd569802ec87011d653d6815c6d7b9ffb969e9fee5b8b20ef860e8dce9" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" dependencies = [ "bindgen", "cc", @@ -618,9 +617,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.6.0", "cexpr", @@ -907,9 +906,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] @@ -1374,9 +1373,9 @@ dependencies = [ [[package]] name = "diligent-date-parser" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cf7fe294274a222363f84bcb63cdea762979a0443b4cf1f4f8fd17c86b1182" +checksum = "c8ede7d79366f419921e2e2f67889c12125726692a313bffb474bd5f37a581e9" dependencies = [ "chrono", ] @@ -1471,9 +1470,9 @@ dependencies = [ [[package]] name = "email-encoding" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc" dependencies = [ "base64 0.22.1", "memchr", @@ -1599,9 +1598,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fdeflate" @@ -2897,12 +2896,12 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3219,12 +3218,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "mockall" version = "0.13.0" @@ -3598,9 +3591,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plist" @@ -3725,9 +3718,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", "syn 2.0.87", @@ -3821,16 +3814,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quick-xml" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" -dependencies = [ - "encoding_rs", - "memchr", -] - [[package]] name = "quick-xml" version = "0.37.1" @@ -4324,9 +4307,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" diff --git a/Cargo.toml b/Cargo.toml index b1553be5c..df10a78b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,21 +103,21 @@ diesel-async = "0.5.1" serde = { version = "1.0.215", features = ["derive"] } serde_with = "3.9.0" actix-web = { version = "4.9.0", default-features = false, features = [ - "macros", - "rustls-0_23", "compress-brotli", "compress-gzip", "compress-zstd", "cookies", + "macros", + "rustls-0_23", ] } tracing = "0.1.40" tracing-actix-web = { version = "0.7.10", default-features = false } tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } url = { version = "2.5.3", features = ["serde"] } reqwest = { version = "0.12.7", default-features = false, features = [ - "json", "blocking", "gzip", + "json", "rustls-tls", ] } reqwest-middleware = "0.3.3" @@ -126,17 +126,15 @@ clokwerk = "0.4.0" doku = { version = "0.21.1", features = ["url-2"] } bcrypt = "0.15.1" chrono = { version = "0.4.38", features = [ - "serde", "now", + "serde", ], default-features = false } serde_json = { version = "1.0.132", features = ["preserve_order"] } base64 = "0.22.1" uuid = { version = "1.11.0", features = ["serde"] } async-trait = "0.1.83" captcha = "0.0.9" -anyhow = { version = "1.0.93", features = [ - "backtrace", -] } # backtrace is on by default on nightly, but not stable rust +anyhow = { version = "1.0.93", features = ["backtrace"] } diesel_ltree = "0.3.1" serial_test = "3.2.0" tokio = { version = "1.41.1", features = ["full"] } @@ -149,7 +147,6 @@ futures = "0.3.31" http = "1.1" rosetta-i18n = "0.1.3" ts-rs = { version = "10.0.0", features = [ - "serde-compat", "chrono-impl", "no-serde-warnings", "url-impl", diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml index 74a0390ca..b9e8a5a76 100644 --- a/crates/api_common/Cargo.toml +++ b/crates/api_common/Cargo.toml @@ -67,9 +67,9 @@ urlencoding = { workspace = true } mime = { version = "0.3.17", optional = true } mime_guess = "2.0.5" infer = "0.16.0" -webpage = { version = "2.0", default-features = false, features = [ +webpage = { version = "2.0", default-features = false, optional = true, features = [ "serde", -], optional = true } +] } encoding_rs = { version = "0.8.35", optional = true } jsonwebtoken = { version = "9.3.0", optional = true } diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml index eac9d6ddd..a511508f8 100644 --- a/crates/db_schema/Cargo.toml +++ b/crates/db_schema/Cargo.toml @@ -52,8 +52,8 @@ activitypub_federation = { workspace = true, optional = true } lemmy_utils = { workspace = true, optional = true } bcrypt = { workspace = true, optional = true } diesel = { workspace = true, features = [ - "postgres", "chrono", + "postgres", "serde_json", "uuid", ], optional = true } @@ -61,14 +61,14 @@ diesel-derive-newtype = { workspace = true, optional = true } diesel-derive-enum = { workspace = true, optional = true } diesel_migrations = { workspace = true, optional = true } diesel-async = { workspace = true, features = [ - "postgres", "deadpool", + "postgres", ], optional = true } regex = { workspace = true, optional = true } diesel_ltree = { workspace = true, optional = true } async-trait = { workspace = true } tracing = { workspace = true } -deadpool = { version = "0.12.1", features = ["rt_tokio_1"], optional = true } +deadpool = { version = "0.12.1", optional = true, features = ["rt_tokio_1"] } ts-rs = { workspace = true, optional = true } futures-util = { workspace = true } tokio = { workspace = true, optional = true } diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml index 18a79826b..00f8bdcaf 100644 --- a/crates/db_views_actor/Cargo.toml +++ b/crates/db_views_actor/Cargo.toml @@ -26,13 +26,13 @@ full = [ [dependencies] lemmy_db_schema = { workspace = true } diesel = { workspace = true, features = [ - "postgres", "chrono", + "postgres", "serde_json", ], optional = true } diesel-async = { workspace = true, features = [ - "postgres", "deadpool", + "postgres", ], optional = true } serde = { workspace = true } serde_with = { workspace = true } diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml index df8ec1ea2..ae598fa32 100644 --- a/crates/db_views_moderator/Cargo.toml +++ b/crates/db_views_moderator/Cargo.toml @@ -20,13 +20,13 @@ full = ["lemmy_db_schema/full", "diesel", "diesel-async", "ts-rs"] [dependencies] lemmy_db_schema = { workspace = true } diesel = { workspace = true, features = [ - "postgres", "chrono", + "postgres", "serde_json", ], optional = true } diesel-async = { workspace = true, features = [ - "postgres", "deadpool", + "postgres", ], optional = true } serde = { workspace = true } serde_with = { workspace = true } diff --git a/crates/federate/Cargo.toml b/crates/federate/Cargo.toml index 5d7454276..bdfc00678 100644 --- a/crates/federate/Cargo.toml +++ b/crates/federate/Cargo.toml @@ -25,7 +25,7 @@ activitypub_federation.workspace = true anyhow.workspace = true futures.workspace = true chrono.workspace = true -diesel = { workspace = true, features = ["postgres", "chrono", "serde_json"] } +diesel = { workspace = true, features = ["chrono", "postgres", "serde_json"] } diesel-async = { workspace = true, features = ["deadpool", "postgres"] } reqwest.workspace = true serde_json.workspace = true diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 7ed4c0476..ded84132c 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -65,10 +65,10 @@ anyhow = { workspace = true, optional = true } reqwest-middleware = { workspace = true, optional = true } strum = { workspace = true } futures = { workspace = true, optional = true } -diesel = { workspace = true, features = ["chrono"], optional = true } +diesel = { workspace = true, optional = true, features = ["chrono"] } http = { workspace = true, optional = true } doku = { workspace = true, features = ["url-2"], optional = true } -uuid = { workspace = true, features = ["serde", "v4"], optional = true } +uuid = { workspace = true, optional = true, features = ["v4"] } rosetta-i18n = { workspace = true, optional = true } tokio = { workspace = true, optional = true } urlencoding = { workspace = true, optional = true } @@ -77,9 +77,8 @@ deser-hjson = { version = "2.2.4", optional = true } smart-default = { version = "0.7.1", optional = true } lettre = { version = "0.11.10", default-features = false, features = [ "builder", - "tokio1", - "tokio1-rustls-tls", "smtp-transport", + "tokio1-rustls-tls", ], optional = true } markdown-it = { version = "0.6.1", optional = true } ts-rs = { workspace = true, optional = true }