Skip to content

Commit cb79d12

Browse files
committed
bump samod to lilith's version yaay
1 parent 92f236b commit cb79d12

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

Cargo.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ rlimit = "0.10.2"
5555
tracing = "0.1.40"
5656
tracing-appender = "0.2.2"
5757
chrono = "0.4.31"
58-
samod = { version="0.8.0", features = ["tokio", "threadpool", "tungstenite"] }
58+
samod = { git="https://github.com/LilithSilver/samod.git", branch="connection_handles", features = ["tokio", "threadpool", "tungstenite"] }
5959
rayon = "1.11.0"
6060
regex = "1.12.2"
6161
tokio-tungstenite = "0.27.0"

rust/src/project/connection.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
use std::sync::Arc;
2-
31
use futures::Stream;
4-
use samod::{BackoffConfig, DialerHandle, Repo, Url, tokio_io::TcpDialer};
2+
use samod::{BackoffConfig, DialerHandle, Repo, Url};
53
use tokio_util::sync::CancellationToken;
64

75
use crate::helpers::spawn_utils::spawn_named;
@@ -27,14 +25,7 @@ impl RemoteConnection {
2725
repo.dial_websocket(server_url, BackoffConfig::default())
2826
.ok()?
2927
} else if server_url.scheme() == "tcp" {
30-
repo.dial(
31-
BackoffConfig::default(),
32-
Arc::new(TcpDialer::new_host_port(
33-
server_url.host_str()?,
34-
server_url.port()?,
35-
)),
36-
)
37-
.ok()?
28+
repo.dial_tcp(server_url, BackoffConfig::default()).ok()?
3829
} else {
3930
tracing::error!(
4031
"Could not initialize server connection; the URL {server_url} has an invalid scheme (must be tcp://, ws://, or wss://)"

0 commit comments

Comments
 (0)