commit e1a55c6532253c030128599a3ca132c7ef7b1bcf
parent 7da98b3c5cca79d77109b9039605198c3714588e
Author: Ken Sedgwick <ken@bonsai.com>
Date: Mon, 16 Dec 2024 16:04:39 -0800
update nostrdb-rs for async stream support
Closes: https://github.com/damus-io/notedeck/pull/584
Diffstat:
M | Cargo.lock | | | 118 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- |
M | Cargo.toml | | | 10 | +++++----- |
2 files changed, 112 insertions(+), 16 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -1217,7 +1217,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "thiserror 2.0.6",
+ "thiserror 2.0.7",
"tracing",
"url",
]
@@ -1428,6 +1428,95 @@ dependencies = [
]
[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
name = "generic-array"
version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2420,14 +2509,15 @@ dependencies = [
[[package]]
name = "nostrdb"
-version = "0.4.0"
-source = "git+https://github.com/damus-io/nostrdb-rs?rev=46ca13dffdfe2320d4488912506c7bfa02afe284#46ca13dffdfe2320d4488912506c7bfa02afe284"
+version = "0.5.0"
+source = "git+https://github.com/damus-io/nostrdb-rs?rev=d7ad4a44b929157795601a68542490b4184ae657#d7ad4a44b929157795601a68542490b4184ae657"
dependencies = [
"bindgen",
"cc",
"flatbuffers",
+ "futures",
"libc",
- "thiserror 2.0.6",
+ "thiserror 2.0.7",
"tokio",
"tracing",
"tracing-subscriber",
@@ -2452,7 +2542,7 @@ dependencies = [
"strum",
"strum_macros",
"tempfile",
- "thiserror 2.0.6",
+ "thiserror 2.0.7",
"tracing",
"url",
"uuid",
@@ -2513,7 +2603,7 @@ dependencies = [
"strum",
"strum_macros",
"tempfile",
- "thiserror 2.0.6",
+ "thiserror 2.0.7",
"tokio",
"tracing",
"tracing-appender",
@@ -3021,6 +3111,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
name = "pkg-config"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3989,11 +4085,11 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "2.0.6"
+version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
+checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767"
dependencies = [
- "thiserror-impl 2.0.6",
+ "thiserror-impl 2.0.7",
]
[[package]]
@@ -4009,9 +4105,9 @@ dependencies = [
[[package]]
name = "thiserror-impl"
-version = "2.0.6"
+version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
+checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36"
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,10 +28,10 @@ image = { version = "0.25", features = ["jpeg", "png", "webp"] }
indexmap = "2.6.0"
log = "0.4.17"
nostr = { version = "0.37.0", default-features = false, features = ["std", "nip49"] }
-nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "46ca13dffdfe2320d4488912506c7bfa02afe284" }
-notedeck = { path = "crates/notedeck" }
-notedeck_chrome = { path = "crates/notedeck_chrome" }
-notedeck_columns = { path = "crates/notedeck_columns" }
+nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "d7ad4a44b929157795601a68542490b4184ae657" }
+notedeck = { path = "crates/notedeck" }
+notedeck_chrome = { path = "crates/notedeck_chrome" }
+notedeck_columns = { path = "crates/notedeck_columns" }
open = "5.3.0"
poll-promise = { version = "0.3.0", features = ["tokio"] }
puffin = { git = "https://github.com/jb55/puffin", package = "puffin", rev = "70ff86d5503815219b01a009afd3669b7903a057" }
@@ -41,7 +41,7 @@ serde_derive = "1"
serde_json = "1.0.89"
strum = "0.26"
strum_macros = "0.26"
-thiserror = "2.0.6"
+thiserror = "2.0.7"
tokio = { version = "1.16", features = ["macros", "rt-multi-thread", "fs"] }
tracing = "0.1.40"
tracing-appender = "0.2.3"