fix wasm build errors

anweiss · Oct 25, 2022 · d0e2b76 · d0e2b76
1 parent b1005f0
commit d0e2b76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/token.rs b/src/token.rs
@@ -191,6 +191,7 @@ pub enum Token<'a> {
 }
 
 /// Control operator tokens
+#[cfg_attr(target_arch = "wasm32", derive(Serialize))]
 #[derive(PartialEq, Eq, Debug, Copy, Clone)]
 pub enum ControlOperator {
   // Control operators

diff --git a/src/validator/cbor.rs b/src/validator/cbor.rs
@@ -1492,8 +1492,8 @@ where
       }
       #[cfg(feature = "additional-controls")]
       #[cfg(target_arch = "wasm32")]
-      t @ Some(Token::FEATURE) => {
-        self.ctrl = t;
+      ControlOperator::FEATURE => {
+        self.ctrl = Some(ctrl);
 
         if let Some(ef) = &self.enabled_features {
           let tv = text_value_from_type2(self.cddl, controller);

diff --git a/src/validator/json.rs b/src/validator/json.rs
@@ -1475,8 +1475,8 @@ impl<'a, 'b> Visitor<'a, 'b, Error> for JSONValidator<'a> {
       }
       #[cfg(feature = "additional-controls")]
       #[cfg(target_arch = "wasm32")]
-      t @ Some(Token::FEATURE) => {
-        self.ctrl = t;
+      ControlOperator::FEATURE => {
+        self.ctrl = Some(ctrl);
 
         if let Some(ef) = &self.enabled_features {
           let tv = text_value_from_type2(self.cddl, controller);