summaryrefslogtreecommitdiff
path: root/cli/npm
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-09-13 17:53:07 -0400
committerGitHub <noreply@github.com>2023-09-13 21:53:07 +0000
commit12a75e3b4328dd36a63799262b2e252f9fb9d58e (patch)
treede314e328363b7c2758faf65957f616a4063ac88 /cli/npm
parent022664aab4ff5e1a9ec6257781f464f56da7a357 (diff)
refactor: move `deno_core::TaskQueue` to `cli::util::sync` (#20481)
TaskQueue is being removed from `deno_core` and replaced with an unsync version in deno_unsyc. https://github.com/denoland/deno_core/pull/193 This is a change in preparation for that. The remaining `deno_core::TaskQueue` usage in this repo should be replaced with `deno_core::unsync::TaskQueue` once upgraded.
Diffstat (limited to 'cli/npm')
-rw-r--r--cli/npm/registry.rs4
-rw-r--r--cli/npm/resolution.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/cli/npm/registry.rs b/cli/npm/registry.rs
index 907258d3b..ec0647023 100644
--- a/cli/npm/registry.rs
+++ b/cli/npm/registry.rs
@@ -18,7 +18,6 @@ use deno_core::futures::FutureExt;
use deno_core::parking_lot::Mutex;
use deno_core::serde_json;
use deno_core::url::Url;
-use deno_core::TaskQueue;
use deno_npm::registry::NpmPackageInfo;
use deno_npm::registry::NpmRegistryApi;
use deno_npm::registry::NpmRegistryPackageInfoLoadError;
@@ -30,6 +29,7 @@ use crate::http_util::HttpClient;
use crate::util::fs::atomic_write_file;
use crate::util::progress_bar::ProgressBar;
use crate::util::sync::AtomicFlag;
+use crate::util::sync::TaskQueue;
use super::cache::should_sync_download;
use super::cache::NpmCache;
@@ -118,7 +118,7 @@ impl NpmRegistryApi for CliNpmRegistryApi {
let result = if should_sync_download() {
let inner = self.inner().clone();
SYNC_DOWNLOAD_TASK_QUEUE
- .queue(async move { inner.maybe_package_info(name).await })
+ .run(async move { inner.maybe_package_info(name).await })
.await
} else {
self.inner().maybe_package_info(name).await
diff --git a/cli/npm/resolution.rs b/cli/npm/resolution.rs
index 73e27f487..10ff5fd92 100644
--- a/cli/npm/resolution.rs
+++ b/cli/npm/resolution.rs
@@ -7,7 +7,6 @@ use std::sync::Arc;
use deno_core::error::AnyError;
use deno_core::parking_lot::Mutex;
use deno_core::parking_lot::RwLock;
-use deno_core::TaskQueue;
use deno_lockfile::NpmPackageDependencyLockfileInfo;
use deno_lockfile::NpmPackageLockfileInfo;
use deno_npm::registry::NpmPackageInfo;
@@ -32,6 +31,7 @@ use deno_semver::package::PackageReq;
use deno_semver::VersionReq;
use crate::args::Lockfile;
+use crate::util::sync::TaskQueue;
use super::registry::CliNpmRegistryApi;