Merge pull request #186 from Tencent/relaese/v0.8.1

Relaese/v0.8.1

Author: iyangsj

CHANGELOG.md

@@ -11,6 +11,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [v0.8.1] - 2024-03-18
+
+### Removed
+
+- Remove the sfv feature flag from h3 (to resolve a build issue at docs.rs)
+
+
 ## [v0.8.0] - 2024-03-15
 
 ### Added
@@ -157,6 +164,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Provide example clients and servers.
 
 
+[v0.8.1]: https://github.com/tencent/tquic/compare/v0.8.0...v0.8.1
+[v0.8.0]: https://github.com/tencent/tquic/compare/v0.7.0...v0.8.0
 [v0.7.0]: https://github.com/tencent/tquic/compare/v0.6.0...v0.7.0
 [v0.6.0]: https://github.com/tencent/tquic/compare/v0.5.0...v0.6.0
 [v0.5.0]: https://github.com/tencent/tquic/compare/v0.4.0...v0.5.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tquic"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 rust-version = "1.70.0"
 license = "Apache-2.0"
@@ -29,9 +29,6 @@ include = [
 # build the FFI API
 ffi = []
 
-# enable sfv
-default = ["sfv"]
-
 [dependencies]
 bytes = "1"
 rustc-hash = "1.1"
@@ -51,7 +48,7 @@ serde_derive = "1.0"
 serde_with = "3.0.0"
 hex = "0.4"
 priority-queue = "1.3.2"
-sfv = { version = "0.9", optional = true }
+sfv = { version = "0.9" }
 
 [dev-dependencies]
 env_logger = "0.10.0"

src/h3/connection.rs

@@ -14,7 +14,6 @@
 
 use std::collections::hash_map;
 use std::collections::VecDeque;
-#[cfg(feature = "sfv")]
 use std::convert::TryFrom;
 use std::mem::MaybeUninit;
 use std::sync::Arc;
@@ -2106,8 +2105,6 @@ impl Http3Priority {
     }
 }
 
-#[cfg(feature = "sfv")]
-#[cfg_attr(docsrs, doc(cfg(feature = "sfv")))]
 impl TryFrom<&[u8]> for Http3Priority {
     type Error = crate::h3::Http3Error;
 
@@ -4414,17 +4411,14 @@ mod tests {
 
         assert_eq!(s.server_poll(), Ok((stream_id, Http3Event::PriorityUpdate)));
 
-        #[cfg(feature = "sfv")]
-        {
-            let priority_value = s.server.take_priority_update(stream_id).unwrap();
-            assert_eq!(
-                Http3Priority::try_from(priority_value.as_slice()),
-                Ok(Http3Priority {
-                    urgency: 3,
-                    incremental: false
-                })
-            );
-        }
+        let priority_value = s.server.take_priority_update(stream_id).unwrap();
+        assert_eq!(
+            Http3Priority::try_from(priority_value.as_slice()),
+            Ok(Http3Priority {
+                urgency: 3,
+                incremental: false
+            })
+        );
 
         // Subcase3: Client send priority update for request stream, incremental.
         s.client
@@ -4442,17 +4436,14 @@ mod tests {
 
         assert_eq!(s.server_poll(), Ok((stream_id, Http3Event::PriorityUpdate)));
 
-        #[cfg(feature = "sfv")]
-        {
-            let priority_value = s.server.take_priority_update(stream_id).unwrap();
-            assert_eq!(
-                Http3Priority::try_from(priority_value.as_slice()),
-                Ok(Http3Priority {
-                    urgency: 3,
-                    incremental: true
-                })
-            );
-        }
+        let priority_value = s.server.take_priority_update(stream_id).unwrap();
+        assert_eq!(
+            Http3Priority::try_from(priority_value.as_slice()),
+            Ok(Http3Priority {
+                urgency: 3,
+                incremental: true
+            })
+        );
 
         assert_eq!(s.server_poll(), Err(Http3Error::Done));
     }
@@ -4480,17 +4471,14 @@ mod tests {
         // 2. Server receive priority update.
         assert_eq!(s.server_poll(), Ok((stream_id, Http3Event::PriorityUpdate)));
 
-        #[cfg(feature = "sfv")]
-        {
-            let priority_value = s.server.take_priority_update(stream_id).unwrap();
-            assert_eq!(
-                Http3Priority::try_from(priority_value.as_slice()),
-                Ok(Http3Priority {
-                    urgency: 3,
-                    incremental: false
-                })
-            );
-        }
+        let priority_value = s.server.take_priority_update(stream_id).unwrap();
+        assert_eq!(
+            Http3Priority::try_from(priority_value.as_slice()),
+            Ok(Http3Priority {
+                urgency: 3,
+                incremental: false
+            })
+        );
 
         // Stream's priority is not initialized, the underlying quic stream is not opened, in server side.
         let stream = s.server.streams.get(&stream_id).unwrap();
@@ -4576,17 +4564,14 @@ mod tests {
         assert_eq!(s.server_poll(), Ok((stream_id, Http3Event::PriorityUpdate)));
         assert_eq!(s.server_poll(), Err(Http3Error::Done));
 
-        #[cfg(feature = "sfv")]
-        {
-            let priority_value = s.server.take_priority_update(stream_id).unwrap();
-            assert_eq!(
-                Http3Priority::try_from(priority_value.as_slice()),
-                Ok(Http3Priority {
-                    urgency: 5,
-                    incremental: false
-                })
-            );
-        }
+        let priority_value = s.server.take_priority_update(stream_id).unwrap();
+        assert_eq!(
+            Http3Priority::try_from(priority_value.as_slice()),
+            Ok(Http3Priority {
+                urgency: 5,
+                incremental: false
+            })
+        );
 
         assert_eq!(s.server_poll(), Err(Http3Error::Done));
     }
@@ -4818,7 +4803,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "sfv")]
     fn parse_extensible_priority() {
         for (priority, urgency, incremental) in [
             ("", PRIORITY_URGENCY_DEFAULT, PRIORITY_INCREMENTAL_DEFAULT),

tools/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tquic_tools"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 rust-version = "1.70.0"
 license = "Apache-2.0"
@@ -23,7 +23,7 @@ rand = "0.8.5"
 statrs = "0.16"
 jemallocator = { version = "0.5", package = "tikv-jemallocator" }
 signal-hook = "0.3.17"
-tquic = { path = "..", version = "0.8.0"}
+tquic = { path = "..", version = "0.8.1"}
 
 [lib]
 crate-type = ["lib"]