From e782b6cab4607ac7a478b0bc3bd580f3eb0e00b0 Mon Sep 17 00:00:00 2001
From: Sebastien Guillemot <sebastiengllmt@gmail.com>
Date: Wed, 19 Oct 2022 03:42:30 +0900
Subject: [PATCH] Bump to anweiss/cddl ast-parent-pointer

---
 Cargo.lock     | 20 +++++++++++++++-----
 Cargo.toml     |  2 +-
 src/parsing.rs |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03a4faf..0742039 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,7 +116,7 @@ checksum = "52b3d8b289b6c7d6d8832c8e2bf151c7677126afa627f51e19a6320aec8237cb"
 [[package]]
 name = "cddl"
 version = "0.9.0"
-source = "git+https://github.com/dcSpark/cddl?branch=fix-group-comments#51bac9d087aeb0c628de9e5893741ea3b3347eef"
+source = "git+https://github.com/anweiss/cddl?branch=dcSpark-ast-parent-pointer#a94078e041023052c6c8d4b8786c6267a0696c1a"
 dependencies = [
  "abnf_to_pest",
  "base16",
@@ -138,6 +138,7 @@ dependencies = [
  "regex",
  "regex-syntax",
  "serde",
+ "serde-wasm-bindgen",
  "serde_json",
  "simplelog",
  "uriparse",
@@ -290,9 +291,9 @@ dependencies = [
 
 [[package]]
 name = "crossterm"
-version = "0.23.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
 dependencies = [
  "bitflags",
  "crossterm_winapi",
@@ -760,6 +761,17 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfc62771e7b829b517cb213419236475f434fb480eddd76112ae182d274434a"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.144"
@@ -980,8 +992,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
 dependencies = [
  "cfg-if",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index e2c5716..1709e2e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 
 [dependencies]
 cbor_event = "2.1.3"
-cddl = { git = 'https://github.com/dcSpark/cddl', branch = 'fix-group-comments' }
+cddl = { git = 'https://github.com/anweiss/cddl', branch = 'dcSpark-ast-parent-pointer' }
 clap = { version = "~3.1.5", features = ["derive"] }
 codegen = "0.1.3"
 either = "1.5.3"
diff --git a/src/parsing.rs b/src/parsing.rs
index aa10870..15ddcda 100644
--- a/src/parsing.rs
+++ b/src/parsing.rs
@@ -719,7 +719,7 @@ fn group_entry_optional(entry: &GroupEntry) -> bool {
     occur
         .as_ref()
         .map(|o| match o.occur {
-            Occur::Optional(_) => true,
+            Occur::Optional { .. } => true,
             _ => false,
         })
         .unwrap_or(false)