diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2022-12-06 14:12:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 14:12:51 -0500 |
| commit | c03e0f3853490e804fe30fc566b45150061badc9 (patch) | |
| tree | 0f23dad9542c8cf80d0861c2932e2eb1b9e6fc3a /cli/proc_state.rs | |
| parent | 3e47a27f4fa528b91ac60b07ee6931f47fed0bc5 (diff) | |
refactor: remove `deno_graph::Locker` usage (#16877)
This is just a straight refactor and doesn't make any improvements to
the code that could now be made.
Closes #16493
Diffstat (limited to 'cli/proc_state.rs')
| -rw-r--r-- | cli/proc_state.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cli/proc_state.rs b/cli/proc_state.rs index 4dce3cdba..aae606c80 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -329,7 +329,6 @@ impl ProcState { root_permissions.clone(), dynamic_permissions.clone(), ); - let maybe_locker = Lockfile::as_maybe_locker(self.lockfile.clone()); let maybe_imports = self.options.to_maybe_imports()?; let maybe_resolver = self.maybe_resolver.as_ref().map(|r| r.as_graph_resolver()); @@ -383,16 +382,16 @@ impl ProcState { is_dynamic, imports: maybe_imports, resolver: maybe_resolver, - locker: maybe_locker, module_analyzer: Some(&*analyzer), reporter: maybe_file_watcher_reporter, }, ) .await; - // If there was a locker, validate the integrity of all the modules in the - // locker. - graph_lock_or_exit(&graph); + // If there is a lockfile, validate the integrity of all the modules. + if let Some(lockfile) = &self.lockfile { + graph_lock_or_exit(&graph, &mut lockfile.lock()); + } // Determine any modules that have already been emitted this session and // should be skipped. @@ -639,7 +638,6 @@ impl ProcState { roots: Vec<(ModuleSpecifier, ModuleKind)>, loader: &mut dyn Loader, ) -> Result<deno_graph::ModuleGraph, AnyError> { - let maybe_locker = Lockfile::as_maybe_locker(self.lockfile.clone()); let maybe_imports = self.options.to_maybe_imports()?; let maybe_cli_resolver = CliResolver::maybe_new( @@ -657,7 +655,6 @@ impl ProcState { is_dynamic: false, imports: maybe_imports, resolver: maybe_graph_resolver, - locker: maybe_locker, module_analyzer: Some(&*analyzer), reporter: None, }, |