Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 0 additions & 47 deletions tooling/nargo/src/ops/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,6 @@ use crate::errors::CompileError;
use crate::prepare_package;
use crate::{package::Package, workspace::Workspace};

use rayon::prelude::*;

/// Compiles workspace.
///
/// # Errors
///
/// This function will return an error if there are any compilations errors reported.
pub fn compile_workspace(
file_manager: &FileManager,
parsed_files: &ParsedFiles,
workspace: &Workspace,
compile_options: &CompileOptions,
) -> CompilationResult<(Vec<CompiledProgram>, Vec<CompiledContract>)> {
let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
.into_iter()
.filter(|package| !package.is_library())
.cloned()
.partition(|package| package.is_binary());

// Compile all of the packages in parallel.
let program_results: Vec<CompilationResult<CompiledProgram>> = binary_packages
.par_iter()
.map(|package| {
compile_program(file_manager, parsed_files, workspace, package, compile_options, None)
})
.collect();
let contract_results: Vec<CompilationResult<CompiledContract>> = contract_packages
.par_iter()
.map(|package| compile_contract(file_manager, parsed_files, package, compile_options))
.collect();

// Collate any warnings/errors which were encountered during compilation.
let compiled_programs = collect_errors(program_results);
let compiled_contracts = collect_errors(contract_results);

match (compiled_programs, compiled_contracts) {
(Ok((programs, program_warnings)), Ok((contracts, contract_warnings))) => {
let warnings = [program_warnings, contract_warnings].concat();
Ok(((programs, contracts), warnings))
}
(Err(program_errors), Err(contract_errors)) => {
Err([program_errors, contract_errors].concat())
}
(Err(errors), _) | (_, Err(errors)) => Err(errors),
}
}

pub fn compile_program(
file_manager: &FileManager,
parsed_files: &ParsedFiles,
Expand Down
2 changes: 1 addition & 1 deletion tooling/nargo/src/ops/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pub use self::check::check_program;
pub use self::compile::{
check_crate_and_report_errors, collect_errors, compile_contract, compile_program,
compile_program_with_debug_instrumenter, compile_workspace, report_errors,
compile_program_with_debug_instrumenter, report_errors,
};
pub use self::optimize::{optimize_contract, optimize_program};
pub use self::transform::{transform_contract, transform_program};
Expand Down
Loading