diff --git a/Cargo.lock b/Cargo.lock index a6384b35..c941056d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -501,9 +501,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -693,7 +693,6 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "zstd", ] [[package]] @@ -711,7 +710,6 @@ dependencies = [ "thread_local", "tokio", "tracing", - "zstd", ] [[package]] @@ -779,7 +777,6 @@ dependencies = [ "tokio", "tracing", "url", - "zstd", ] [[package]] @@ -1691,9 +1688,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" [[package]] name = "inlinable_string" @@ -2036,9 +2033,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.5.0", "cfg-if", @@ -2506,9 +2503,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -2941,7 +2938,7 @@ dependencies = [ [[package]] name = "rust-librocksdb-sys" version = "0.22.0+9.2.1" -source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#368922d31b3fdb1c163542c1bfebd386ab46fc74" +source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=e9e1cb5ba92a44ea225fe8d13b31aa23621b9035#e9e1cb5ba92a44ea225fe8d13b31aa23621b9035" dependencies = [ "bindgen", "bzip2-sys", @@ -2958,7 +2955,7 @@ dependencies = [ [[package]] name = "rust-rocksdb" version = "0.26.0" -source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#368922d31b3fdb1c163542c1bfebd386ab46fc74" +source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=e9e1cb5ba92a44ea225fe8d13b31aa23621b9035#e9e1cb5ba92a44ea225fe8d13b31aa23621b9035" dependencies = [ "libc", "rust-librocksdb-sys", @@ -3153,9 +3150,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "sentry" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" +checksum = "3b73ab9d5b35ed718611e89db8c886647821cfce79723b9e2e4e7cb3fd9cdd49" dependencies = [ "httpdate", "reqwest", @@ -3175,9 +3172,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79194074f34b0cbe5dd33896e5928bbc6ab63a889bd9df2264af5acb186921e" +checksum = "8ce52a2633e0332821389f865762b94852e71b359cd8e95cbf91f38c154302cb" dependencies = [ "backtrace", "once_cell", @@ -3187,9 +3184,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba8870c5dba2bfd9db25c75574a11429f6b95957b0a78ac02e2970dd7a5249a" +checksum = "10565e6eb013737bf7555250f8b4b8248a571e1de4de7230037f5dd5ea51bc63" dependencies = [ "hostname 0.4.0", "libc", @@ -3201,12 +3198,15 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a75011ea1c0d5c46e9e57df03ce81f5c7f0a9e199086334a1f9c0a541e0826" +checksum = "a2c5e7a0430cfa86b7cb6e7bc01a56331937b2ba08ab703c2e7331139a99f121" dependencies = [ + "crc32fast", + "itertools 0.13.0", "once_cell", "rand", + "regex", "sentry-types", "serde", "serde_json", @@ -3214,9 +3214,9 @@ dependencies = [ [[package]] name = "sentry-debug-images" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec2a486336559414ab66548da610da5e9626863c3c4ffca07d88f7dc71c8de8" +checksum = "2be3e693a65dba8578790de0c6adc0a833815979590ed867336aff8fbcf9cbf7" dependencies = [ "findshlibs", "once_cell", @@ -3225,9 +3225,9 @@ dependencies = [ [[package]] name = "sentry-log" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74b7261245ff17a8c48e8f3e1e96fb6b84146870121af880d53aef6a5b4f784" +checksum = "184b15d2ee727a35a0731ab6c860491a8737149abbe06eee9fbe43fac24b2f07" dependencies = [ "log", "sentry-core", @@ -3235,9 +3235,9 @@ dependencies = [ [[package]] name = "sentry-panic" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eaa3ecfa3c8750c78dcfd4637cfa2598b95b52897ed184b4dc77fcf7d95060d" +checksum = "6f4040c0ad5670b90fc60759bbb31e3fc0d6517448d0c7440255a6f7362c50e7" dependencies = [ "sentry-backtrace", "sentry-core", @@ -3245,9 +3245,9 @@ dependencies = [ [[package]] name = "sentry-tower" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df141464944fdf8e2a6f2184eb1d973a20456466f788346b6e3a51791cdaa370" +checksum = "d03daa33dfa3adc8b99da9afe10b1775a8c689e3242bf616badec7455916c525" dependencies = [ "http 1.1.0", "pin-project", @@ -3259,9 +3259,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f715932bf369a61b7256687c6f0554141b7ce097287e30e3f7ed6e9de82498fe" +checksum = "151ff7c03687737ba11969ccdc6f45eb7775ed7a95880810297c6cc8c3574e75" dependencies = [ "sentry-backtrace", "sentry-core", @@ -3271,9 +3271,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4519c900ce734f7a0eb7aba0869dfb225a7af8820634a7dd51449e3b093cfb7c" +checksum = "10d5ad9e33b9f6f598387a6a23aa23c7f13e4e7740a34cd4d9c8db851bfdae05" dependencies = [ "debugid", "hex", diff --git a/Cargo.toml b/Cargo.toml index cc6d5960..ee9c0100 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ name = "conduit" version = "0.5.0" [workspace.dependencies.infer] -version = "0.15" +version = "0.16" default-features = false [workspace.dependencies.jsonwebtoken] @@ -114,7 +114,7 @@ features = [ ] [workspace.dependencies.serde] -version = "1.0.201" +version = "1.0.203" features = ["rc"] [workspace.dependencies.serde_json] @@ -184,7 +184,7 @@ version = "0.3.30" default-features = false [workspace.dependencies.tokio] -version = "1.37.0" +version = "1.38.0" features = [ "fs", "net", @@ -261,7 +261,7 @@ version = "2.1.1" # used to replace the channels of the tokio runtime [workspace.dependencies.loole] -version = "0.3.0" +version = "0.3.1" [workspace.dependencies.async-trait] version = "0.1.80" @@ -313,9 +313,6 @@ features = [ "bzip2", ] -[workspace.dependencies.zstd] -version = "0.13.1" - # to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest [workspace.dependencies.axum-server-dual-protocol] version = "0.6" @@ -344,7 +341,7 @@ features = ["rt-tokio"] # optional sentry metrics for crash/panic reporting [workspace.dependencies.sentry] -version = "0.32.3" +version = "0.33.0" default-features = false features = [ "backtrace", @@ -360,9 +357,9 @@ features = [ ] [workspace.dependencies.sentry-tracing] -version = "0.32.3" +version = "0.33.0" [workspace.dependencies.sentry-tower] -version = "0.32.3" +version = "0.33.0" # jemalloc usage [workspace.dependencies.tikv-jemalloc-sys] @@ -386,7 +383,7 @@ features = ["bundled"] # used only by rusqlite [workspace.dependencies.parking_lot] -version = "0.12.2" +version = "0.12.3" # used only by rusqlite [workspace.dependencies.thread_local] @@ -400,7 +397,7 @@ default-features = false version = "0.2" [workspace.dependencies.nix] -version = "0.28.0" +version = "0.29.0" features = ["resource"] [workspace.dependencies.sd-notify] diff --git a/deps/rust-rocksdb/Cargo.toml b/deps/rust-rocksdb/Cargo.toml index 4dce69d1..ff549845 100644 --- a/deps/rust-rocksdb/Cargo.toml +++ b/deps/rust-rocksdb/Cargo.toml @@ -27,7 +27,8 @@ malloc-usable-size = ["rust-rocksdb/malloc-usable-size"] [dependencies.rust-rocksdb] git = "https://github.com/zaidoon1/rust-rocksdb" -branch = "master" +rev = "e9e1cb5ba92a44ea225fe8d13b31aa23621b9035" +#branch = "master" default-features = false [lib] diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index dd17946f..67aba76f 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -101,8 +101,6 @@ tokio.workspace = true tracing-subscriber.workspace = true tracing.workspace = true url.workspace = true -zstd.optional = true -zstd.workspace = true [target.'cfg(unix)'.dependencies] nix.workspace = true diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index 113414cb..18e073ed 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -58,8 +58,6 @@ thread_local.optional = true thread_local.workspace = true tokio.workspace = true tracing.workspace = true -zstd.optional = true -zstd.workspace = true [lints] workspace = true diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index f6f682a9..2cdf6240 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -65,8 +65,6 @@ sha2.workspace = true tokio.workspace = true tracing.workspace = true url.workspace = true -zstd.optional = true -zstd.workspace = true [lints] workspace = true