From a128d367ff0b96fdd7a5a9287eb6c114e6f2f040 Mon Sep 17 00:00:00 2001
From: Pranav Gaddamadugu <pranavsaig@gmail.com>
Date: Fri, 24 Sep 2021 17:12:58 -0700
Subject: [PATCH] Resolving conflicts with master

---
 compiler/src/option.rs | 12 ------------
 leo/commands/build.rs  | 16 ----------------
 2 files changed, 28 deletions(-)

diff --git a/compiler/src/option.rs b/compiler/src/option.rs
index 6daf13b16d..a2e5a58706 100644
--- a/compiler/src/option.rs
+++ b/compiler/src/option.rs
@@ -43,15 +43,3 @@ pub struct AstSnapshotOptions {
     pub canonicalized: bool,
     pub type_inferenced: bool,
 }
-
-impl Default for AstSnapshotOptions {
-    fn default() -> Self {
-        Self {
-            spans_enabled: false,
-            initial: false,
-            imports_resolved: false,
-            canonicalized: false,
-            type_inferenced: false,
-        }
-    }
-}
diff --git a/leo/commands/build.rs b/leo/commands/build.rs
index a086684055..1dfe9b8cb7 100644
--- a/leo/commands/build.rs
+++ b/leo/commands/build.rs
@@ -57,22 +57,6 @@ pub struct BuildOptions {
     pub enable_type_inferenced_ast_snapshot: bool,
 }
 
-impl Default for BuildOptions {
-    fn default() -> Self {
-        Self {
-            disable_constant_folding: false,
-            disable_code_elimination: false,
-            disable_all_optimizations: false,
-            enable_spans: false,
-            enable_all_ast_snapshots: false,
-            enable_initial_ast_snapshot: false,
-            enable_imports_resolved_ast_snapshot: false,
-            enable_canonicalized_ast_snapshot: false,
-            enable_type_inferenced_ast_snapshot: false,
-        }
-    }
-}
-
 impl From<BuildOptions> for CompilerOptions {
     fn from(options: BuildOptions) -> Self {
         if options.disable_all_optimizations {