Resolve merge conflicts

.rusty-hook.toml

@@ -2,4 +2,4 @@
 pre-commit = "cargo +nightly clippy && cargo +nightly fmt --all -- --check"
 
 [logging]
-verbose = false
+verbose = true

Cargo.lock

@@ -140,7 +140,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "clang-sys",
  "clap",
- "env_logger 0.7.1",
+ "env_logger",
  "lazy_static",
  "lazycell",
  "log",
@@ -380,9 +380,9 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08"
+checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa"
 dependencies = [
  "encode_unicode",
  "lazy_static",
@@ -391,7 +391,6 @@ dependencies = [
  "terminal_size",
  "unicode-width",
  "winapi 0.3.9",
- "winapi-util",
 ]
 
 [[package]]
@@ -630,12 +629,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "dotenv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
-
 [[package]]
 name = "either"
 version = "1.6.1"
@@ -664,20 +657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 dependencies = [
  "atty",
- "humantime 1.3.0",
+ "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
-dependencies = [
- "atty",
- "humantime 2.0.1",
  "log",
  "regex",
  "termcolor",
@@ -1046,12 +1026,6 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "humantime"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
-
 [[package]]
 name = "hyper"
 version = "0.13.9"
@@ -1278,8 +1252,6 @@ dependencies = [
  "pest",
  "serde",
  "serde_json",
- "snarkos-errors",
- "snarkos-models",
 ]
 
 [[package]]
@@ -1315,7 +1287,6 @@ dependencies = [
  "snarkos-utilities",
  "thiserror",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
@@ -1382,11 +1353,6 @@ dependencies = [
  "pest",
  "pest-ast",
  "pest_derive",
- "snarkos-algorithms",
- "snarkos-curves",
- "snarkos-errors",
- "snarkos-gadgets",
- "snarkos-models",
  "thiserror",
  "tracing",
 ]
@@ -1399,8 +1365,6 @@ dependencies = [
  "colored",
  "console",
  "dirs",
- "dotenv",
- "env_logger 0.8.2",
  "from-pest",
  "lazy_static",
  "leo-ast",
@@ -1442,7 +1406,6 @@ version = "1.0.7"
 dependencies = [
  "lazy_static",
  "serde",
- "serde_json",
  "thiserror",
  "toml",
  "tracing",
@@ -2461,9 +2424,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
 dependencies = [
  "itoa",
  "ryu",
@@ -2829,18 +2792,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -2936,9 +2899,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
  "serde",
 ]

Cargo.toml

@@ -107,13 +107,7 @@ version = "2.0"
 version = "3.0.1"
 
 [dependencies.console]
-version = "0.13.0"
+version = "0.14.0"
-
-[dependencies.dotenv]
-version = "0.15.0"
-
-[dependencies.env_logger]
-version = "0.8"
 
 [dependencies.from-pest]
 version = "0.3.1"

ast/Cargo.toml

@@ -34,16 +34,6 @@ version = "1.0.7"
 path = "../input"
 version = "1.0.7"
 
-[dependencies.snarkos-errors]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
-[dependencies.snarkos-models]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
 [dependencies.indexmap]
 version = "1.6.1"
 features = [ "serde-1" ]

compiler/Cargo.toml

@@ -123,9 +123,6 @@ version = "1.0"
 [dependencies.tracing]
 version = "0.1"
 
-[dependencies.tracing-subscriber]
-version = "0.2"
-
 [dev-dependencies.num-bigint]
 version = "0.3"
 

input/Cargo.toml

@@ -17,31 +17,6 @@ include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
 license = "GPL-3.0"
 edition = "2018"
 
-[dependencies.snarkos-algorithms]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
-[dependencies.snarkos-curves]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
-[dependencies.snarkos-errors]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
-[dependencies.snarkos-gadgets]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
-[dependencies.snarkos-models]
-git = "https://github.com/AleoHQ/snarkOS.git"
-version = "1.1.4"
-default-features = false
-
 [dependencies.from-pest]
 version = "0.3.1"
 

package/Cargo.toml

@@ -21,9 +21,6 @@ edition = "2018"
 version = "1.0"
 features = [ "derive" ]
 
-[dependencies.serde_json]
-version = "1.0"
-
 [dependencies.thiserror]
 version = "1.0"