Bump version

Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "tide_tracing"
-version = "0.7.0"
+version = "0.6.4"
 authors = ["Michael Pfaff <michael@pfaff.dev>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-nrid = { git = "https://git.pfaff.dev/michael/nrid.rs.git", tag = "v0.2.0", default-features = false }
-tide = { version = "0.16", default-features = false }
+nrid = { git = "https://git.pfaff.dev/michael/nrid.rs.git", tag = "v0.3.0", default-features = false }
+tide = { version = ">=0.16, <=0.17.0-beta.1", default-features = false }
 tracing = "0.1"
 async-trait = "0.1"
-num_enum = "0.7"
+num_enum = "0.5"

src/lib.rs

@@ -1,3 +1,5 @@
+#![feature(const_trait_impl)]
+
 #[macro_use]
 extern crate tracing;
 
@@ -27,47 +29,38 @@ pub struct ReqComps(u8);
 impl ReqComps {
     #[inline]
     pub const fn contains(self, mask: ReqComp) -> bool {
-        self.bitand_one(mask).0 == mask as u8
+        (self & mask).0 == mask as u8
     }
 
     #[inline]
-    pub const fn contains_all(self, mask: Self) -> bool {
-        self.bitand_self(mask).0 == mask.0
-    }
-
-    #[inline]
-    const fn bitand_self(self, rhs: Self) -> Self {
-        Self((self.0 as u8) & (rhs.0 as u8))
-    }
-
-    #[inline]
-    const fn bitand_one(self, rhs: ReqComp) -> Self {
-        Self((self.0 as u8) & (rhs as u8))
+    pub const fn contains_all(self, mask: ReqComps) -> bool {
+        self & mask == mask
     }
 }
 
-impl Default for ReqComps {
+impl const Default for ReqComps {
     #[inline]
     fn default() -> Self {
         Self(0)
     }
 }
 
-impl From<ReqComp> for ReqComps {
+// unfortunately, the automatic Into impl will not be const.
+impl const From<ReqComp> for ReqComps {
     #[inline]
     fn from(comp: ReqComp) -> Self {
         Self(comp as u8)
     }
 }
 
-impl core::cmp::PartialEq for ReqComps {
+impl const core::cmp::PartialEq for ReqComps {
     #[inline]
     fn eq(&self, comp: &Self) -> bool {
         self.0 == comp.0
     }
 }
 
-impl core::ops::BitOr for ReqComp {
+impl const core::ops::BitOr for ReqComp {
     type Output = ReqComps;
 
     #[inline]
@@ -76,16 +69,16 @@ impl core::ops::BitOr for ReqComp {
     }
 }
 
-impl core::ops::BitOr for ReqComps {
+impl const core::ops::BitOr for ReqComps {
     type Output = ReqComps;
 
     #[inline]
     fn bitor(self, rhs: Self) -> Self::Output {
-        ReqComps(self.0 | rhs.0)
+        ReqComps((self.0 as u8) | (rhs.0 as u8))
     }
 }
 
-impl core::ops::BitOr<ReqComp> for ReqComps {
+impl const core::ops::BitOr<ReqComp> for ReqComps {
     type Output = ReqComps;
 
     #[inline]
@@ -94,6 +87,7 @@ impl core::ops::BitOr<ReqComp> for ReqComps {
     }
 }
 
+// TODO make `const` when is "stable" #57349 <https://github.com/rust-lang/rust/issues/57349>
 impl core::ops::BitOrAssign for ReqComps {
     #[inline]
     fn bitor_assign(&mut self, rhs: ReqComps) {
@@ -101,6 +95,7 @@ impl core::ops::BitOrAssign for ReqComps {
     }
 }
 
+// TODO make `const` when is "stable" #57349 <https://github.com/rust-lang/rust/issues/57349>
 impl core::ops::BitOrAssign<ReqComp> for ReqComps {
     #[inline]
     fn bitor_assign(&mut self, rhs: ReqComp) {
@@ -108,7 +103,7 @@ impl core::ops::BitOrAssign<ReqComp> for ReqComps {
     }
 }
 
-impl core::ops::BitAnd for ReqComp {
+impl const core::ops::BitAnd for ReqComp {
     type Output = ReqComps;
 
     #[inline]
@@ -117,21 +112,21 @@ impl core::ops::BitAnd for ReqComp {
     }
 }
 
-impl core::ops::BitAnd for ReqComps {
+impl const core::ops::BitAnd for ReqComps {
     type Output = ReqComps;
 
     #[inline]
     fn bitand(self, rhs: Self) -> Self::Output {
-        self.bitand_self(rhs)
+        ReqComps((self.0 as u8) & (rhs.0 as u8))
     }
 }
 
-impl core::ops::BitAnd<ReqComp> for ReqComps {
+impl const core::ops::BitAnd<ReqComp> for ReqComps {
     type Output = ReqComps;
 
     #[inline]
     fn bitand(self, rhs: ReqComp) -> Self::Output {
-        self.bitand_one(rhs)
+        ReqComps((self.0 as u8) & (rhs as u8))
     }
 }
 
@@ -156,7 +151,7 @@ pub struct LogMiddleware {
     pub components: ReqComps,
 }
 
-impl Default for LogMiddleware {
+impl const Default for LogMiddleware {
     #[inline]
     fn default() -> Self {
         Self {