Merge branch 'master' into feat/no-ref/free-up-disk-space-in-ci

ntex-rs · Oct 9, 2023 · 8736b90 · 8736b90
2 parents 3339be4 + 8c3e8eb
commit 8736b90
Show file tree

Hide file tree

Showing 21 changed files with 166 additions and 267 deletions.
diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml
@@ -18,7 +18,7 @@ default = []
 simd = ["simdutf8"]
 
 [dependencies]
-bitflags = "1.3"
+bitflags = "2.4"
 bytes = "1.0.0"
 serde = "1.0.0"
 futures-core = { version = "0.3", default-features = false, features = ["alloc"] }

diff --git a/ntex-bytes/src/pool.rs b/ntex-bytes/src/pool.rs
@@ -26,6 +26,7 @@ pub struct BufParams {
 }
 
 bitflags::bitflags! {
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     struct Flags: u8 {
         const SPAWNED    = 0b0000_0001;
         const INCREASED  = 0b0000_0010;

diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml
@@ -21,7 +21,7 @@ ntex-bytes = "0.1.19"
 ntex-util = "0.3.2"
 ntex-service = "1.2.6"
 
-bitflags = "1.3"
+bitflags = "2.4"
 log = "0.4"
 pin-project-lite = "0.2"
 

diff --git a/ntex-io/src/dispatcher.rs b/ntex-io/src/dispatcher.rs
@@ -25,6 +25,7 @@ pin_project_lite::pin_project! {
 }
 
 bitflags::bitflags! {
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     struct Flags: u8  {
         const READY_ERR  = 0b0001;
         const IO_ERR     = 0b0010;

diff --git a/ntex-io/src/io.rs b/ntex-io/src/io.rs
@@ -14,6 +14,7 @@ use crate::tasks::{ReadContext, WriteContext};
 use crate::{FilterLayer, Handle, IoStatusUpdate, IoStream, RecvError};
 
 bitflags::bitflags! {
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     pub struct Flags: u16 {
         /// io is closed
         const IO_STOPPED          = 0b0000_0000_0000_0001;

diff --git a/ntex-io/src/testing.rs b/ntex-io/src/testing.rs
@@ -37,6 +37,7 @@ pub struct IoTest {
 }
 
 bitflags::bitflags! {
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     struct IoTestFlags: u8 {
         const FLUSHED = 0b0000_0001;
         const CLOSED  = 0b0000_0010;

diff --git a/ntex-util/Cargo.toml b/ntex-util/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/lib.rs"
 [dependencies]
 ntex-rt = "0.4.7"
 ntex-service = "1.2.6"
-bitflags = "1.3"
+bitflags = "2.4"
 fxhash = "0.2.1"
 log = "0.4"
 slab = "0.4"

diff --git a/ntex-util/src/channel/pool.rs b/ntex-util/src/channel/pool.rs
@@ -26,6 +26,7 @@ impl<T> fmt::Debug for Pool<T> {
 }
 
 bitflags::bitflags! {
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     struct Flags: u8 {
         const SENDER = 0b0000_0001;
         const RECEIVER = 0b0000_0010;

diff --git a/ntex-util/src/time/wheel.rs b/ntex-util/src/time/wheel.rs
@@ -131,6 +131,7 @@ impl Drop for TimerHandle {
 }
 
 bitflags::bitflags! {
+    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
     pub struct Flags: u8 {
         const DRIVER_STARTED = 0b0000_0001;
         const DRIVER_RECALC  = 0b0000_0010;

diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.7.6] - 2023-10-xx
+
+* Upgrade ntex-h2 to 0.4
+
 ## [0.7.5] - 2023-10-01
 
 * Fix compile error for 'compress' feature with async-std & glommio #226

diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex"
-version = "0.7.5"
+version = "0.7.6"
 authors = ["ntex contributors <[email protected]>"]
 description = "Framework for composable network services"
 readme = "README.md"
@@ -56,7 +56,7 @@ ntex-service = "1.2.6"
 ntex-macros = "0.1.3"
 ntex-util = "0.3.2"
 ntex-bytes = "0.1.19"
-ntex-h2 = "0.3.2"
+ntex-h2 = "0.4.2"
 ntex-rt = "0.4.9"
 ntex-io = "0.3.4"
 ntex-tls = "0.3.1"
@@ -67,7 +67,7 @@ ntex-async-std = { version = "0.3.0", optional = true }
 async-oneshot = "0.5.0"
 async-channel = "1.8.0"
 base64 = "0.21"
-bitflags = "1.3"
+bitflags = "2.4"
 log = "0.4"
 num_cpus = "1.13"
 nanorand = { version = "0.7.0", default-features = false, features = ["std", "wyrand"] }