From 538e2ffafb6b6c3a92ef320069aab55b19c520ed Mon Sep 17 00:00:00 2001 From: tesol2y090 Date: Tue, 31 Dec 2024 20:03:00 +0700 Subject: [PATCH 1/5] feat: deprecated support_draft_29 field --- transports/quic/src/config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/transports/quic/src/config.rs b/transports/quic/src/config.rs index c623632ddc6..89d110a47f3 100644 --- a/transports/quic/src/config.rs +++ b/transports/quic/src/config.rs @@ -59,6 +59,7 @@ pub struct Config { /// If support for draft-29 is enabled servers support draft-29 and version 1 on all /// QUIC listening addresses. /// As client the version is chosen based on the remote's address. + #[deprecated(note = "QUIC draft versions are no longer supported")] pub support_draft_29: bool, /// TLS client config for the inner [`quinn::ClientConfig`]. From 2a95c843cf4d7e2f088e92852c97caaa224e9bbc Mon Sep 17 00:00:00 2001 From: tesol2y090 Date: Tue, 31 Dec 2024 21:03:50 +0700 Subject: [PATCH 2/5] feat: update changelog --- transports/quic/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md index 238cbebe6cf..c6a1e4d0407 100644 --- a/transports/quic/CHANGELOG.md +++ b/transports/quic/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.11.3 + +- Deprecate `Config::support_draft_29`. + See [PR 5786](https://github.com/libp2p/rust-libp2p/pull/5786). + ## 0.11.2 - Deprecate `void` crate. From 01552a719e189336d32a5e34612915d1727b3a2b Mon Sep 17 00:00:00 2001 From: tesol2y090 Date: Wed, 1 Jan 2025 10:59:35 +0700 Subject: [PATCH 3/5] feat: move changelog under 0.11.2 --- transports/quic/CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md index c6a1e4d0407..ec153507326 100644 --- a/transports/quic/CHANGELOG.md +++ b/transports/quic/CHANGELOG.md @@ -1,13 +1,11 @@ -## 0.11.3 - -- Deprecate `Config::support_draft_29`. - See [PR 5786](https://github.com/libp2p/rust-libp2p/pull/5786). - ## 0.11.2 - Deprecate `void` crate. See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676). +- Deprecate `Config::support_draft_29`. + See [PR 5786](https://github.com/libp2p/rust-libp2p/pull/5786). + ## 0.11.1 - Update `libp2p-tls` to version `0.5.0`, see [PR 5547] From 55965023c8d5e6e55e76b8115e6b5bbf24654052 Mon Sep 17 00:00:00 2001 From: tesol2y090 Date: Wed, 1 Jan 2025 11:46:09 +0700 Subject: [PATCH 4/5] chore: add allow deprecated on support_draft_29 --- transports/quic/src/config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/transports/quic/src/config.rs b/transports/quic/src/config.rs index 89d110a47f3..b056a5df32b 100644 --- a/transports/quic/src/config.rs +++ b/transports/quic/src/config.rs @@ -59,6 +59,7 @@ pub struct Config { /// If support for draft-29 is enabled servers support draft-29 and version 1 on all /// QUIC listening addresses. /// As client the version is chosen based on the remote's address. + #[allow(deprecated)] #[deprecated(note = "QUIC draft versions are no longer supported")] pub support_draft_29: bool, From b802f050bc39904c1ac6efed50f3379c0ba4758d Mon Sep 17 00:00:00 2001 From: tesol2y090 Date: Tue, 28 Jan 2025 22:01:15 +0700 Subject: [PATCH 5/5] feat: use expect instead of allow --- transports/quic/src/config.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/transports/quic/src/config.rs b/transports/quic/src/config.rs index b056a5df32b..b11436093ad 100644 --- a/transports/quic/src/config.rs +++ b/transports/quic/src/config.rs @@ -59,7 +59,7 @@ pub struct Config { /// If support for draft-29 is enabled servers support draft-29 and version 1 on all /// QUIC listening addresses. /// As client the version is chosen based on the remote's address. - #[allow(deprecated)] + #[expect(deprecated)] #[deprecated(note = "QUIC draft versions are no longer supported")] pub support_draft_29: bool, @@ -87,6 +87,7 @@ impl Config { Self { client_tls_config, server_tls_config, + #[expect(deprecated)] support_draft_29: false, handshake_timeout: Duration::from_secs(5), max_idle_timeout: 10 * 1000, @@ -134,6 +135,7 @@ impl From for QuinnConfig { keep_alive_interval, max_connection_data, max_stream_data, + #[expect(deprecated)] support_draft_29, handshake_timeout: _, keypair, @@ -171,6 +173,7 @@ impl From for QuinnConfig { }) .unwrap_or_default(); + #[expect(deprecated)] if !support_draft_29 { endpoint_config.supported_versions(vec![1]); }