Commit 2a0dc09a authored by gabi-250's avatar gabi-250 🤸
Browse files

Merge branch 'reexport-oneshot' into 'main' 

tor-async-utils: Re-export oneshot-fused-workaround as oneshot.

See merge request tpo/core/arti!2383
parents bc3afc6a a88af5e9

Cargo.lock

+2 −1
Original line number Diff line number Diff line
@@ -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",

crates/arti-rpcserver/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -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"] }

crates/oneshot-fused-workaround/Cargo.toml

+1 −1
Original line number Diff line number Diff line 
[package]

name = "oneshot-fused-workaround"

version = "0.21.0"

version = "0.1.0"

authors = ["The Tor Project, Inc.", "Nick Mathewson <nickm@torproject.org>"]

edition = "2021"

rust-version = "1.70"

crates/tor-async-utils/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -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"

crates/tor-async-utils/src/lib.rs

+2 −0
Original line number Diff line number Diff line
@@ -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;