From 4ef6c8a01ada7918b775a7832b6520c1f334edae Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sun, 11 Feb 2024 14:21:52 -0500
Subject: [PATCH] does this commit work???

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 Cargo.lock | 52 ++++++++++++++++++++++++++--------------------------
 Cargo.toml |  8 ++++----
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 85bd39b82..690d4b503 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -415,9 +415,9 @@ dependencies = [
  "regex",
  "reqwest",
  "ring",
+ "rocksdb",
  "ruma",
  "rusqlite",
- "rust-rocksdb",
  "sd-notify",
  "serde",
  "serde_html_form",
@@ -1280,6 +1280,22 @@ dependencies = [
  "redox_syscall",
 ]
 
+[[package]]
+name = "librocksdb-sys"
+version = "0.16.0+8.10.0"
+source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8#8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
+dependencies = [
+ "bindgen",
+ "bzip2-sys",
+ "cc",
+ "glob",
+ "libc",
+ "libz-sys",
+ "lz4-sys",
+ "pkg-config",
+ "zstd-sys",
+]
+
 [[package]]
 name = "libsqlite3-sys"
 version = "0.27.0"
@@ -2086,6 +2102,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "rocksdb"
+version = "0.21.0"
+source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8#8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
+dependencies = [
+ "libc",
+ "librocksdb-sys",
+]
+
 [[package]]
 name = "ruma"
 version = "0.9.4"
@@ -2288,31 +2313,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "rust-librocksdb-sys"
-version = "0.16.0+8.10.0"
-source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8f65a73f0962edc4cc028f4012692043dc657a76#8f65a73f0962edc4cc028f4012692043dc657a76"
-dependencies = [
- "bindgen",
- "bzip2-sys",
- "cc",
- "glob",
- "libc",
- "libz-sys",
- "lz4-sys",
- "pkg-config",
- "zstd-sys",
-]
-
-[[package]]
-name = "rust-rocksdb"
-version = "0.22.1"
-source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8f65a73f0962edc4cc028f4012692043dc657a76#8f65a73f0962edc4cc028f4012692043dc657a76"
-dependencies = [
- "libc",
- "rust-librocksdb-sys",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
diff --git a/Cargo.toml b/Cargo.toml
index caf03c521..2b4811dce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,9 +106,9 @@ sd-notify = { version = "0.4.1", optional = true }
 
 webpage = { version = "2.0", default-features = false }
 
-[dependencies.rust-rocksdb]
+[dependencies.rocksdb]
 git = "https://github.com/zaidoon1/rust-rocksdb"
-rev = "8f65a73f0962edc4cc028f4012692043dc657a76"
+rev = "8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
 default-features = false
 features = ["multi-threaded-cf", "zstd", "snappy", "lz4"]
 optional = true
@@ -120,7 +120,7 @@ nix = { version = "0.27.1", features = ["resource"] }
 [features]
 default = ["conduit_bin", "backend_rocksdb", "systemd", "zstd_compression"]
 backend_sqlite = ["sqlite"]
-backend_rocksdb = ["rust-rocksdb"]
+backend_rocksdb = ["rocksdb"]
 jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"]
 sqlite = ["rusqlite", "parking_lot", "tokio/signal"]
 conduit_bin = ["axum"]
@@ -130,7 +130,7 @@ zstd_compression = []
 #brotli_compression = ["tower-http/compression-br"]
 #compression = ["tower-http/compression-full"]
 sha256_media = []
-io_uring = ["rust-rocksdb/io-uring"]
+io_uring = ["rocksdb/io-uring"]
 
 [[bin]]
 name = "conduit"
-- 
GitLab