Skip to content

Commit f3243c9

Browse files
committed
Merge quic and quic_datagram links
The approach taken in 0351b5a wasn't necessary; unreliable QUIC can be implemented within the same link.
1 parent cbb319e commit f3243c9

File tree

15 files changed

+315
-1521
lines changed

15 files changed

+315
-1521
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ members = [
3434
"io/zenoh-link",
3535
"io/zenoh-link-commons",
3636
"io/zenoh-links/zenoh-link-quic/",
37-
"io/zenoh-links/zenoh-link-quic_datagram/",
3837
"io/zenoh-links/zenoh-link-serial",
3938
"io/zenoh-links/zenoh-link-tcp/",
4039
"io/zenoh-links/zenoh-link-tls/",
@@ -218,7 +217,6 @@ zenoh-keyexpr = { version = "=1.5.0", path = "commons/zenoh-keyexpr", default-fe
218217
zenoh-link = { version = "=1.5.0", path = "io/zenoh-link" }
219218
zenoh-link-commons = { version = "=1.5.0", path = "io/zenoh-link-commons" }
220219
zenoh-link-quic = { version = "=1.5.0", path = "io/zenoh-links/zenoh-link-quic" }
221-
zenoh-link-quic_datagram = { version = "=1.5.0", path = "io/zenoh-links/zenoh-link-quic_datagram" }
222220
zenoh-link-serial = { version = "=1.5.0", path = "io/zenoh-links/zenoh-link-serial" }
223221
zenoh-link-tcp = { version = "=1.5.0", path = "io/zenoh-links/zenoh-link-tcp" }
224222
zenoh-link-tls = { version = "=1.5.0", path = "io/zenoh-links/zenoh-link-tls" }

io/zenoh-link/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ version = { workspace = true }
2626

2727
[features]
2828
transport_quic = ["zenoh-link-quic"]
29-
transport_quic_datagram = ["zenoh-link-quic_datagram"]
3029
transport_serial = ["zenoh-link-serial"]
3130
transport_tcp = ["zenoh-config/transport_tcp", "zenoh-link-tcp"]
3231
transport_tls = ["zenoh-link-tls"]
@@ -43,7 +42,6 @@ transport_ws = ["zenoh-link-ws"]
4342
zenoh-config = { workspace = true }
4443
zenoh-link-commons = { workspace = true }
4544
zenoh-link-quic = { workspace = true, optional = true }
46-
zenoh-link-quic_datagram = { workspace = true, optional = true }
4745
zenoh-link-serial = { workspace = true, optional = true }
4846
zenoh-link-tcp = { workspace = true, optional = true }
4947
zenoh-link-tls = { workspace = true, optional = true }

0 commit comments

Comments
 (0)