Skip to content

Commit

Permalink
sync with quinn git main branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
fakeshadow committed May 4, 2024
1 parent 32889f0 commit fdaec67
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions postgres/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ single-thread = []
tls = ["xitca-tls/rustls-ring-crypto", "sha2", "webpki-roots"]
# feature for using quic as client/server transport layer for better congetion handling on lossy connection.
# note: it does not work as stand alone and server side proxy for translating quic message to tcp is needed.
quic = ["quinn", "quinn-proto", "rustls-pemfile", "tls"]
quic = ["quinn", "rustls-pemfile", "tls"]
# feature for using tokio_uring as IO reactor.
io-uring = ["xitca-io/runtime-uring"]

Expand All @@ -32,8 +32,7 @@ webpki-roots = { version = "0.26", optional = true }
xitca-tls = { version = "0.3.0", optional = true }

# quic
quinn = { version = "0.11", git = "https://github.com/quinn-rs/quinn.git", optional = true }
quinn-proto = { git = "https://github.com/quinn-rs/quinn.git", optional = true }
quinn = { version = "0.11", git = "https://github.com/quinn-rs/quinn.git", features = ["ring"], optional = true }
rustls-pemfile = { version = "2", optional = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion postgres/src/driver/quic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl Writer {

fn poll_shutdown(&mut self, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
match self {
Self::Tx(tx) => tx.poll_finish(cx).map_err(io::Error::other),
Self::Tx(tx) => Poll::Ready(tx.finish().map_err(io::Error::other)),
Self::InFlight(fut) => {
let tx = ready!(fut.as_mut().poll(cx))?;
*self = Self::Tx(tx);
Expand Down

0 comments on commit fdaec67

Please sign in to comment.