Skip to content

fix: don't always use an exclusive lock in nargo check #7120

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

Merged
TomAFrench merged 1 commit into from
Jan 20, 2025
Merged

fix: don't always use an exclusive lock in nargo check #7120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tooling/nargo_cli/src/cli/check_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub(crate) struct CheckCommand {

/// Force overwrite of existing files
#[clap(long = "overwrite")]
allow_overwrite: bool,
pub(super) allow_overwrite: bool,

#[clap(flatten)]
compile_options: CompileOptions,
Expand Down
8 changes: 6 additions & 2 deletions tooling/nargo_cli/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,14 @@ fn command_dir(cmd: &NargoCommand, program_dir: &Path) -> Result<Option<PathBuf>
Ok(Some(nargo_toml::find_root(program_dir, workspace)?))
}

/// Returns:
/// - `Some(true)` if an exclusive lock is needed
/// - `Some(false)` if an read lock is needed
/// - None if no lock is needed
fn needs_lock(cmd: &NargoCommand) -> Option<bool> {
match cmd {
NargoCommand::Check(..)
| NargoCommand::Compile(..)
NargoCommand::Check(check_command) => Some(check_command.allow_overwrite),
NargoCommand::Compile(..)
| NargoCommand::Execute(..)
| NargoCommand::Export(..)
| NargoCommand::Info(..) => Some(true),
Expand Down