From 7aefc011c07f61dc07a8d90aae5e40ae8b134ac3 Mon Sep 17 00:00:00 2001
From: Jun Kurihara <junkurihara@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:22:45 +0900
Subject: [PATCH] chore: follow the up-to-date s2n-quic-h3

---
 rpxy-lib/Cargo.toml                    |  6 +++---
 submodules/s2n-quic-h3/Cargo.toml      |  2 --
 submodules/s2n-quic-h3/src/s2n_quic.rs | 10 ++++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml
index dc5d09a..2d46293 100644
--- a/rpxy-lib/Cargo.toml
+++ b/rpxy-lib/Cargo.toml
@@ -93,14 +93,14 @@ tracing = { version = "0.1.40" }
 quinn = { version = "0.11.5", optional = true }
 h3 = { version = "0.0.6", features = ["tracing"], optional = true }
 h3-quinn = { version = "0.0.7", optional = true }
-s2n-quic-h3 = { path = "../submodules/s2n-quic-h3/", features = [
-  "tracing",
-], optional = true }
 s2n-quic = { version = "1.48.0", default-features = false, features = [
   "provider-tls-rustls",
 ], optional = true }
 s2n-quic-core = { version = "0.48.0", default-features = false, optional = true }
 s2n-quic-rustls = { version = "0.48.0", optional = true }
+s2n-quic-h3 = { path = "../submodules/s2n-quic-h3/", features = [
+  "tracing",
+], optional = true }
 ##########
 # for UDP socket wit SO_REUSEADDR when h3 with quinn
 socket2 = { version = "0.5.7", features = ["all"], optional = true }
diff --git a/submodules/s2n-quic-h3/Cargo.toml b/submodules/s2n-quic-h3/Cargo.toml
index 8d53fc1..0058e45 100644
--- a/submodules/s2n-quic-h3/Cargo.toml
+++ b/submodules/s2n-quic-h3/Cargo.toml
@@ -14,9 +14,7 @@ bytes = { version = "1", default-features = false }
 futures = { version = "0.3", default-features = false }
 h3 = { version = "0.0.6", features = ["tracing"] }
 # s2n-quic = { path = "../s2n-quic" }
-# s2n-quic-core = { path = "../s2n-quic-core" }
 s2n-quic = { version = "1.47.0" }
-s2n-quic-core = { version = "0.48.0" }
 tracing = { version = "0.1.40", optional = true }
 
 [features]
diff --git a/submodules/s2n-quic-h3/src/s2n_quic.rs b/submodules/s2n-quic-h3/src/s2n_quic.rs
index abe0a33..622f965 100644
--- a/submodules/s2n-quic-h3/src/s2n_quic.rs
+++ b/submodules/s2n-quic-h3/src/s2n_quic.rs
@@ -4,8 +4,10 @@
 use bytes::{Buf, Bytes};
 use core::task::ready;
 use h3::quic::{self, Error, StreamId, WriteBuf};
-use s2n_quic::stream::{BidirectionalStream, ReceiveStream};
-use s2n_quic_core::varint::VarInt;
+use s2n_quic::{
+    application,
+    stream::{BidirectionalStream, ReceiveStream},
+};
 use std::{
     convert::TryInto,
     fmt::{self, Display},
@@ -179,7 +181,7 @@ where
         self.conn.close(
             code.value()
                 .try_into()
-                .unwrap_or_else(|_| VarInt::MAX.into()),
+                .unwrap_or(application::Error::UNKNOWN),
         );
     }
 }
@@ -462,7 +464,7 @@ where
     fn reset(&mut self, reset_code: u64) {
         let _ = self
             .stream
-            .reset(reset_code.try_into().unwrap_or_else(|_| VarInt::MAX.into()));
+            .reset(reset_code.try_into().unwrap_or(application::Error::UNKNOWN));
     }
 
     #[cfg_attr(feature = "tracing", instrument(skip_all, level = "trace"))]