Skip to content

Commit f077a14

Browse files
authored
Merge branch 'master' into feature/stream-level-0rtt
2 parents f97258d + d89f0fa commit f077a14

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

h3-datagram/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ license = "MIT"
1414
[dependencies]
1515
#h3 = { path = "../h3" }
1616
bytes = "1.4"
17-
pin-project-lite = { version = "0.2", default-features = false }
1817
tracing = { version = "0.1.40", optional = true }
1918

2019
[features]

h3-quinn/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ quinn = { version = "0.11.7", default-features = false, features = [
1919
"futures-io",
2020
] }
2121
tokio-util = { version = "0.7.9" }
22-
futures = { version = "0.3.28" }
23-
tokio = { version = "1", features = ["io-util"], default-features = false }
22+
futures-util = { version = "0.3.28", default-features = false }
2423
h3-datagram = {version = "0.0.2", path = "../h3-datagram", optional = true }
2524
tracing = { version = "0.1.40", optional = true }
2625

h3-quinn/src/datagram.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use std::future::Future;
66
use std::task::{ready, Poll};
77

8-
use futures::{stream, StreamExt};
8+
use futures_util::{stream, StreamExt};
99
use h3_datagram::datagram::EncodedDatagram;
1010
use h3_datagram::quic_traits::{
1111
DatagramConnectionExt, RecvDatagram, SendDatagram, SendDatagramErrorIncoming,

h3-quinn/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ use std::{
88
future::Future,
99
pin::Pin,
1010
sync::Arc,
11-
task::{self, Poll},
11+
task::{self, ready, Poll},
1212
};
1313

1414
use bytes::{Buf, Bytes};
1515

16-
use futures::{
17-
ready,
16+
use futures_util::{
1817
stream::{self},
1918
Stream, StreamExt,
2019
};

0 commit comments

Comments
 (0)