Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix nargo not showing compiler errors or warnings #1694

Merged
merged 5 commits into from
Jun 15, 2023
Merged

fix: Fix nargo not showing compiler errors or warnings #1694

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec0e0a1
Fix #1645
jfecher Jun 14, 2023
cc83da2
Do not fail when only warnings are given
jfecher Jun 14, 2023
9dea632
Fix test
jfecher Jun 14, 2023
661412e
Move methods to free functions
jfecher Jun 14, 2023
bb4a201
Update wasm crate
jfecher Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions crates/nargo_cli/src/cli/compile_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use acvm::Backend;
use iter_extended::try_vecmap;
use nargo::artifacts::contract::PreprocessedContract;
use noirc_driver::{CompileOptions, CompiledProgram, Driver};
use noirc_errors::reporter;
use std::path::Path;

use clap::Args;
Expand Down Expand Up @@ -49,9 +50,11 @@ pub(crate) fn run<B: Backend>(
// If contracts is set we're compiling every function in a 'contract' rather than just 'main'.
if args.contracts {
let mut driver = setup_driver(backend, &config.program_dir)?;
let compiled_contracts = driver
.compile_contracts(&args.compile_options)
.map_err(|_| CliError::CompilationError)?;
let compiled_contracts =
driver.compile_contracts(&args.compile_options).map_err(|errors| {
reporter::report_all(driver.file_manager(), &errors, false);
phated marked this conversation as resolved.
Show resolved Hide resolved
CliError::CompilationError
})?;

// TODO(#1389): I wonder if it is incorrect for nargo-core to know anything about contracts.
// As can be seen here, It seems like a leaky abstraction where ContractFunctions (essentially CompiledPrograms)
Expand Down Expand Up @@ -118,5 +121,8 @@ pub(crate) fn compile_circuit<B: Backend>(
compile_options: &CompileOptions,
) -> Result<CompiledProgram, CliError<B>> {
let mut driver = setup_driver(backend, program_dir)?;
driver.compile_main(compile_options).map_err(|_| CliError::CompilationError)
driver.compile_main(compile_options).map_err(|errors| {
reporter::report_all(driver.file_manager(), &errors, false);
CliError::CompilationError
})
}
2 changes: 1 addition & 1 deletion crates/noirc_evaluator/src/ssa_refactor/opt/inlining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ impl<'function> PerFunctionContext<'function> {
_ => {
self.context.failed_to_inline_a_call = true;
None
},
}
}
}

Expand Down