merge conflicts

noir-lang · Feb 16, 2023 · eab26bf · eab26bf
2 parents 189defd + 970a34b
commit eab26bf
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/nargo/Cargo.toml b/crates/nargo/Cargo.toml
@@ -34,6 +34,7 @@ tempdir = "0.3.7"
 aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "cff757dca7971161e4bd25e7a744d910c37c22be" }
 aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "cff757dca7971161e4bd25e7a744d910c37c22be" }
 marlin_arkworks_backend = { optional = true, git = "https://github.com/noir-lang/marlin_arkworks_backend", rev = "144378edad821bfaa52bf2cacca8ecc87514a4fc" }
+color-eyre = "0.6.2"
 
 [features]
 default = ["plonk_bn254"]

diff --git a/crates/nargo/src/cli/verify_cmd.rs b/crates/nargo/src/cli/verify_cmd.rs
@@ -43,7 +43,8 @@ pub(crate) fn run(args: ArgMatches) -> Result<(), CliError> {
 
     let result =
         verify_with_path(program_dir, proof_path, circuit_build_path, false, allow_warnings)?;
-    println!("Proof verified : {result}\n");
+    println!("Proof verified : {result}");
+
     Ok(())
 }
 

diff --git a/crates/nargo/src/main.rs b/crates/nargo/src/main.rs
@@ -1,4 +1,15 @@
+#![forbid(unsafe_code)]
+
+use color_eyre::config::HookBuilder;
 use nargo::cli::start_cli;
+
 fn main() {
+    // Register a panic hook to display more readable panic messages to end-users
+    let (panic_hook, _) = HookBuilder::default()
+        .display_env_section(false)
+        .panic_section("This is a bug. Consider opening an issue at https://github.com/noir-lang/noir/issues/new?labels=bug&template=bug_report.md")
+        .into_hooks();
+    panic_hook.install();
+
     start_cli();
 }