summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock3
-rw-r--r--crates/arti-rpcserver/Cargo.toml2
-rw-r--r--crates/oneshot-fused-workaround/Cargo.toml2
-rw-r--r--crates/tor-async-utils/Cargo.toml1
-rw-r--r--crates/tor-async-utils/src/lib.rs2
-rw-r--r--crates/tor-chanmgr/Cargo.toml2
-rw-r--r--crates/tor-circmgr/Cargo.toml2
-rw-r--r--crates/tor-dirmgr/Cargo.toml2
-rw-r--r--crates/tor-guardmgr/Cargo.toml2
-rw-r--r--crates/tor-hsclient/Cargo.toml2
-rw-r--r--crates/tor-hsrproxy/Cargo.toml2
-rw-r--r--crates/tor-hsservice/Cargo.toml2
-rw-r--r--crates/tor-persist/Cargo.toml2
-rw-r--r--crates/tor-proto/Cargo.toml2
-rw-r--r--crates/tor-ptmgr/Cargo.toml2
-rw-r--r--crates/tor-rtmock/Cargo.toml2
16 files changed, 18 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 2122ea0ec..e7e63e9fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3181,7 +3181,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "oneshot-fused-workaround"
-version = "0.21.0"
+version = "0.1.0"
dependencies = [
"futures",
]
@@ -4976,6 +4976,7 @@ dependencies = [
"educe",
"futures",
"futures-await-test",
+ "oneshot-fused-workaround",
"pin-project",
"postage",
"tokio",
diff --git a/crates/arti-rpcserver/Cargo.toml b/crates/arti-rpcserver/Cargo.toml
index 5f2faad2b..a05779285 100644
--- a/crates/arti-rpcserver/Cargo.toml
+++ b/crates/arti-rpcserver/Cargo.toml
@@ -36,7 +36,7 @@ derive-deftly = "0.14"
derive_more = "0.99.3"
erased-serde = "0.4.2"
futures = "0.3.14"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
pin-project = "1"
rand = "0.8"
serde = { version = "1.0.103", features = ["derive"] }
diff --git a/crates/oneshot-fused-workaround/Cargo.toml b/crates/oneshot-fused-workaround/Cargo.toml
index 8c12da55f..73d75fe50 100644
--- a/crates/oneshot-fused-workaround/Cargo.toml
+++ b/crates/oneshot-fused-workaround/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "oneshot-fused-workaround"
-version = "0.21.0"
+version = "0.1.0"
authors = ["The Tor Project, Inc.", "Nick Mathewson <[email protected]>"]
edition = "2021"
rust-version = "1.70"
diff --git a/crates/tor-async-utils/Cargo.toml b/crates/tor-async-utils/Cargo.toml
index d1c1d8315..df05ac221 100644
--- a/crates/tor-async-utils/Cargo.toml
+++ b/crates/tor-async-utils/Cargo.toml
@@ -15,6 +15,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
[dependencies]
educe = "0.4.6"
futures = "0.3.14"
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
pin-project = "1"
postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
void = "1"
diff --git a/crates/tor-async-utils/src/lib.rs b/crates/tor-async-utils/src/lib.rs
index 5ff808452..e415be08f 100644
--- a/crates/tor-async-utils/src/lib.rs
+++ b/crates/tor-async-utils/src/lib.rs
@@ -56,3 +56,5 @@ pub use prepare_send::{SinkPrepareExt, SinkPrepareSendFuture, SinkSendable};
pub use sinkext::SinkExt;
pub use watch::{DropNotifyEofSignallable, DropNotifyWatchSender, PostageWatchSenderExt};
+
+pub use oneshot_fused_workaround as oneshot;
diff --git a/crates/tor-chanmgr/Cargo.toml b/crates/tor-chanmgr/Cargo.toml
index ee19cb796..ce64075ab 100644
--- a/crates/tor-chanmgr/Cargo.toml
+++ b/crates/tor-chanmgr/Cargo.toml
@@ -44,7 +44,7 @@ derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
derive_more = "0.99.3"
educe = "0.4.6"
futures = "0.3.14"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
rand = "0.8"
safelog = { path = "../safelog", version = "0.3.6" }
diff --git a/crates/tor-circmgr/Cargo.toml b/crates/tor-circmgr/Cargo.toml
index 809d4ec6c..f0dc45174 100644
--- a/crates/tor-circmgr/Cargo.toml
+++ b/crates/tor-circmgr/Cargo.toml
@@ -72,7 +72,7 @@ futures = "0.3.14"
humantime-serde = "1.1.1"
itertools = "0.13.0"
once_cell = "1"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
pin-project = "1"
rand = "0.8"
retry-error = { path = "../retry-error", version = "0.5.2" }
diff --git a/crates/tor-dirmgr/Cargo.toml b/crates/tor-dirmgr/Cargo.toml
index 0ca4dd97a..98c6d3515 100644
--- a/crates/tor-dirmgr/Cargo.toml
+++ b/crates/tor-dirmgr/Cargo.toml
@@ -74,7 +74,7 @@ humantime-serde = "1.1.1"
itertools = "0.13.0"
memmap2 = { version = "0.9.0", optional = true }
once_cell = "1"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
paste = "1"
postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
rand = "0.8"
diff --git a/crates/tor-guardmgr/Cargo.toml b/crates/tor-guardmgr/Cargo.toml
index 2098e5a23..cfd85f577 100644
--- a/crates/tor-guardmgr/Cargo.toml
+++ b/crates/tor-guardmgr/Cargo.toml
@@ -65,7 +65,7 @@ humantime = "2"
humantime-serde = "1.1.1"
itertools = "0.13.0"
num_enum = "0.7"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
pin-project = "1"
postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
rand = "0.8"
diff --git a/crates/tor-hsclient/Cargo.toml b/crates/tor-hsclient/Cargo.toml
index 5d872ff18..7713b83ea 100644
--- a/crates/tor-hsclient/Cargo.toml
+++ b/crates/tor-hsclient/Cargo.toml
@@ -49,7 +49,7 @@ educe = "0.4.6"
either = "1"
futures = "0.3.14"
itertools = "0.13.0"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
rand = "0.8"
retry-error = { path = "../retry-error", version = "0.5.2" }
diff --git a/crates/tor-hsrproxy/Cargo.toml b/crates/tor-hsrproxy/Cargo.toml
index 8d070ba62..2e4d1aac1 100644
--- a/crates/tor-hsrproxy/Cargo.toml
+++ b/crates/tor-hsrproxy/Cargo.toml
@@ -41,7 +41,7 @@ derive-deftly = "0.14"
derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
futures = "0.3.14"
# postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
rangemap = "1.3"
safelog = { version = "0.3.6", path = "../safelog" }
serde = { version = "1.0.103", features = ["derive"] }
diff --git a/crates/tor-hsservice/Cargo.toml b/crates/tor-hsservice/Cargo.toml
index 638ad16f6..12af37321 100644
--- a/crates/tor-hsservice/Cargo.toml
+++ b/crates/tor-hsservice/Cargo.toml
@@ -72,7 +72,7 @@ humantime = "2"
itertools = "0.13.0"
k12 = "0.3.0"
once_cell = "1"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }
rand = "0.8.5"
rand_core = "0.6.2"
diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml
index 85abea34f..1ddfdd34c 100644
--- a/crates/tor-persist/Cargo.toml
+++ b/crates/tor-persist/Cargo.toml
@@ -39,7 +39,7 @@ fs-mistrust = { path = "../fs-mistrust", version = "0.7.9", features = ["walkdir
fslock-guard = { path = "../fslock-guard", version = "0.1.2", optional = true }
futures = "0.3.14"
itertools = "0.13.0"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
paste = "1"
sanitize-filename = "0.5.0"
serde = { version = "1.0.103", features = ["derive"] }
diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml
index fa5940939..e05d37cb9 100644
--- a/crates/tor-proto/Cargo.toml
+++ b/crates/tor-proto/Cargo.toml
@@ -66,7 +66,7 @@ educe = "0.4.6"
futures = "0.3.14"
hkdf = "0.12.0"
hmac = "0.12.0"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
pin-project = "1"
rand = "0.8"
rand_core = "0.6.2"
diff --git a/crates/tor-ptmgr/Cargo.toml b/crates/tor-ptmgr/Cargo.toml
index 4468589df..09bf974d2 100644
--- a/crates/tor-ptmgr/Cargo.toml
+++ b/crates/tor-ptmgr/Cargo.toml
@@ -39,7 +39,7 @@ derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
fs-mistrust = { version = "0.7.9", path = "../fs-mistrust" }
futures = "0.3.14"
itertools = "0.13.0"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
serde = { version = "1.0.103", features = ["derive"] }
thiserror = "1"
tor-async-utils = { version = "0.21.0", path = "../tor-async-utils" }
diff --git a/crates/tor-rtmock/Cargo.toml b/crates/tor-rtmock/Cargo.toml
index fa0911c7e..77d095cf2 100644
--- a/crates/tor-rtmock/Cargo.toml
+++ b/crates/tor-rtmock/Cargo.toml
@@ -20,7 +20,7 @@ educe = "0.4.6"
futures = "0.3.14"
humantime = "2"
itertools = "0.13.0"
-oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.21.0" }
+oneshot-fused-workaround = { path = "../oneshot-fused-workaround", version = "0.1.0" }
pin-project = "1"
priority-queue = "2.0.3"
slotmap = "1.0.6"