From 4431da66bc7f344e63ad4ba8d65d936b2d07d337 Mon Sep 17 00:00:00 2001
From: Andrew Wells <anmwells@amazon.com>
Date: Wed, 20 Nov 2024 15:08:44 -0800
Subject: [PATCH] cargo fmt

Signed-off-by: Andrew Wells <anmwells@amazon.com>
---
 cedar-policy-cli/build.rs   |  2 ++
 cedar-policy-cli/src/lib.rs | 62 ++++++++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/cedar-policy-cli/build.rs b/cedar-policy-cli/build.rs
index 07615bdb7..702d67259 100644
--- a/cedar-policy-cli/build.rs
+++ b/cedar-policy-cli/build.rs
@@ -10,6 +10,8 @@ fn generate_schemas() {
         ".cedar_policy_validator",
         "crate::cedar_policy_validator::proto",
     );
+    // PANIC SAFETY: compile-time unwrap
+    #[allow(clippy::unwrap_used)]
     config
         .compile_protos(
             &["protobuf_schema/CLI.proto"],
diff --git a/cedar-policy-cli/src/lib.rs b/cedar-policy-cli/src/lib.rs
index 54a9f6b37..36af31545 100644
--- a/cedar-policy-cli/src/lib.rs
+++ b/cedar-policy-cli/src/lib.rs
@@ -1741,37 +1741,55 @@ pub mod serialization {
         pub new_policies: &'a PolicySet,
     }
 
-    pub fn write_drt_json_for_equivalence(args: EquivalenceArgs) -> Result<()> {
-        let schema = &read_schema_from_file(&args.schema_file)?;
-        let old_policies = &read_policies_from_file(&args.old_policies_file)?;
-        let new_policies = &read_policies_from_file(&args.new_policies_file)?;
-
-        let s: String = serde_json::to_string(&EquivRequest {
-            schema,
-            old_policies,
-            new_policies,
-        })
-        .expect("failed to serialize schema or policies");
-
-        println!("{s}");
-        Ok(())
+    pub fn write_drt_json_for_equivalence(args: EquivalenceArgs) -> CedarExitCode {
+        let schema = &read_schema_from_file(&args.schema_file);
+        let old_policies = &read_policies_from_file(&args.old_policies_file);
+        let new_policies = &read_policies_from_file(&args.new_policies_file);
+
+        match (&schema, &old_policies, &new_policies) {
+            (Ok(schema), Ok(old_policies), Ok(new_policies)) => {
+                match serde_json::to_string(&EquivRequest {
+                    schema,
+                    old_policies,
+                    new_policies,
+                }) {
+                    Ok(s) => {
+                        println!("{s}");
+                        CedarExitCode::Success
+                    }
+                    Err(e) => {
+                        eprintln!("{e}");
+                        CedarExitCode::Failure
+                    }
+                }
+            }
+            (_, _, _) => {
+                if let Some(e) = schema.as_ref().err() {
+                    eprintln!("{e}");
+                }
+                if let Some(e) = old_policies.as_ref().err() {
+                    eprintln!("{e}");
+                }
+                if let Some(e) = new_policies.as_ref().err() {
+                    eprintln!("{e}");
+                }
+                CedarExitCode::Failure
+            }
+        }
     }
 
     pub fn write_drt_json(acmd: AnalysisCommands) -> CedarExitCode {
-        let res = match acmd {
+        match acmd {
             AnalysisCommands::Equivalence(args) => write_drt_json_for_equivalence(args),
-        };
-        match res {
-            Ok(()) => CedarExitCode::Success,
-            Err(e) => {
-                eprintln!("{e}");
-                CedarExitCode::Failure
-            }
         }
     }
 
     #[cfg(feature = "protobufs")]
     pub mod protobuf {
+        // PANIC SAFETY experimental feature
+        #![allow(clippy::unwrap_used)]
+        #![allow(clippy::expect_used)]
+
         use std::fs::File;
         use std::io::Write;
         use std::path::PathBuf;