From 19d94e0a9c8d3db81f3930c90b1a51094e7eaf17 Mon Sep 17 00:00:00 2001
From: Francis Chua <francis@opennetworking.org>
Date: Mon, 4 Oct 2021 13:08:10 -0700
Subject: [PATCH] serde_cbor

---
 cli/Cargo.lock   | 41 +++++++++++++++++------------------------
 cli/Cargo.toml   |  2 +-
 cli/src/utils.rs |  2 +-
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c7c725c..aa2907c 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -72,7 +72,7 @@ dependencies = [
  "resvg",
  "rv",
  "serde",
- "serde_json",
+ "serde_cbor",
  "tiny-skia",
  "usvg",
 ]
@@ -170,6 +170,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "half"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
+
 [[package]]
 name = "hashbrown"
 version = "0.11.2"
@@ -188,12 +194,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
 [[package]]
 name = "jpeg-decoder"
 version = "0.1.22"
@@ -581,12 +581,6 @@ dependencies = [
  "special",
 ]
 
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
 [[package]]
 name = "safe_arch"
 version = "0.5.2"
@@ -605,6 +599,16 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half",
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.130"
@@ -616,17 +620,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_json"
-version = "1.0.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "simplecss"
 version = "0.2.1"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a3336c5..db81097 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -11,7 +11,7 @@ usvg = "0.18.0"
 resvg = "0.18.0"
 tiny-skia = "0.6.1"
 serde =  { version = "1.0.123", features = ["derive"] }
-serde_json = "1.0.67"
+serde_cbor = "0.11.2"
 rv = "0.13.0"
 
 [features]
diff --git a/cli/src/utils.rs b/cli/src/utils.rs
index 27c64b8..6a785d2 100644
--- a/cli/src/utils.rs
+++ b/cli/src/utils.rs
@@ -12,7 +12,7 @@ impl Dump {
 	pub fn load(path: &str) -> Self {
 		let file = std::fs::File::open(path).unwrap();
 		let reader = std::io::BufReader::new(file);
-		let dump: Dump = serde_json::from_reader(reader).unwrap();
+		let dump: Dump = serde_cbor::from_reader(reader).unwrap();
 		dump
 	}
 	pub fn to_filtered(&self) -> FilteredData {