Merge branch 'master' into neon

Cargo.toml

@@ -17,17 +17,22 @@ exclude = [
 ]
 
 [dependencies]
+defmt = { version = "0.3", optional = true }
 serde = { version = "1.0", default-features = false, optional = true }
 
 [features]
 default = ["std", "serde"]
 std = ["alloc", "serde?/std"]
-alloc = []
+alloc = ["defmt?/alloc"]
 serde = ["dep:serde", "alloc"]
+defmt-03 = ["dep:defmt"]
 
 [target.'cfg(not(feature = "alloc"))'.dependencies]
 heapless = { version = "0.8" }
 
+[target.'cfg(not(feature = "alloc"))'.features]
+defmt-03 = ["dep:defmt", "heapless/defmt-03"]
+
 [dev-dependencies]
 criterion = "0.5"
 rustc-hex = "1.0"

src/decode.rs

@@ -152,6 +152,7 @@ pub unsafe fn hex_check_sse(src: &[u8]) -> bool {
 }
 
 #[derive(Eq, PartialEq)]
+#[cfg_attr(feature = "defmt-03", derive(defmt::Format))]
 pub enum CheckCase {
     None,
     Lower,

src/error.rs

@@ -1,4 +1,5 @@
 #[derive(Clone, Copy, PartialEq)]
+#[cfg_attr(feature = "defmt-03", derive(defmt::Format))]
 pub enum Error {
     InvalidChar,
     InvalidLength(usize),

src/lib.rs

@@ -38,6 +38,7 @@ pub use crate::decode::{hex_check_neon, hex_check_neon_with_case};
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 #[allow(dead_code)]
+#[cfg_attr(feature = "defmt-03", derive(defmt::Format))]
 pub(crate) enum Vectorization {
     None = 0,
     SSE41 = 1,
@@ -120,7 +121,7 @@ fn vectorization_support_no_cache_x86() -> Vectorization {
 
     let have_xsave = (proc_info_ecx >> 26) & 1 == 1;
     let have_osxsave = (proc_info_ecx >> 27) & 1 == 1;
-    let have_avx = (proc_info_ecx >> 27) & 1 == 1;
+    let have_avx = (proc_info_ecx >> 28) & 1 == 1;
     if have_xsave && have_osxsave && have_avx {
         // # Safety: We checked that the processor supports xsave
         if unsafe { avx2_support_no_cache_x86() } {