From bb809992ad543ea4c0c31897fbf2d130394dd80e Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Sat, 5 Sep 2020 13:18:50 +0200
Subject: Add json output format

This patch adds a new output format, JSON.  It uses serde to serialize
the output types.

todo: man page, changelog
---
 src/args.rs | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'src/args.rs')

diff --git a/src/args.rs b/src/args.rs
index 758af8c..3936738 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -58,39 +58,14 @@ impl From<DeviceModel> for nitrokey::Model {
   }
 }
 
-impl<'de> serde::Deserialize<'de> for DeviceModel {
-  fn deserialize<D>(deserializer: D) -> Result<DeviceModel, D::Error>
-  where
-    D: serde::Deserializer<'de>,
-  {
-    use serde::de::Error as _;
-    use std::str::FromStr as _;
-
-    let s = String::deserialize(deserializer)?;
-    DeviceModel::from_str(&s).map_err(D::Error::custom)
-  }
-}
-
 Enum! {
   /// The format for the nitrocli output.
   OutputFormat, [
+    Json => "json",
     Text => "text",
   ]
 }
 
-impl<'de> serde::Deserialize<'de> for OutputFormat {
-  fn deserialize<D>(deserializer: D) -> Result<OutputFormat, D::Error>
-  where
-    D: serde::Deserializer<'de>,
-  {
-    use serde::de::Error as _;
-    use std::str::FromStr as _;
-
-    let s = String::deserialize(deserializer)?;
-    OutputFormat::from_str(&s).map_err(D::Error::custom)
-  }
-}
-
 Command! {
   /// A top-level command for nitrocli.
   Command, [
-- 
cgit v1.2.1