diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-09-14 13:51:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-14 17:51:28 +0000 |
commit | e66d3c2c2e287879a757e12943a6d240981cb9e8 (patch) | |
tree | 827f518778324a091fa3fbbe8f533fc10b74200a /cli/resolver.rs | |
parent | 54890ee98b9068af41214b86fb693135f0998a0a (diff) |
refactor: remove `DENO_UNSTABLE_NPM_SYNC_DOWNLOAD` and custom sync functionality (#20504)
https://github.com/denoland/deno/pull/20488 enables us to remove this
functionality. This is better because our test suite is now not testing
a separate code path.
Diffstat (limited to 'cli/resolver.rs')
-rw-r--r-- | cli/resolver.rs | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/cli/resolver.rs b/cli/resolver.rs index a7b2cd01e..6fd48db82 100644 --- a/cli/resolver.rs +++ b/cli/resolver.rs @@ -26,7 +26,6 @@ use crate::npm::CliNpmRegistryApi; use crate::npm::NpmResolution; use crate::npm::PackageJsonDepsInstaller; use crate::util::sync::AtomicFlag; -use crate::util::sync::TaskQueue; /// Result of checking if a specifier is mapped via /// an import map or package.json. @@ -110,7 +109,6 @@ pub struct CliGraphResolver { npm_resolution: Arc<NpmResolution>, package_json_deps_installer: Arc<PackageJsonDepsInstaller>, found_package_json_dep_flag: Arc<AtomicFlag>, - sync_download_queue: Option<Arc<TaskQueue>>, } impl Default for CliGraphResolver { @@ -136,7 +134,6 @@ impl Default for CliGraphResolver { npm_resolution, package_json_deps_installer: Default::default(), found_package_json_dep_flag: Default::default(), - sync_download_queue: Self::create_sync_download_queue(), } } } @@ -176,15 +173,6 @@ impl CliGraphResolver { npm_resolution, package_json_deps_installer, found_package_json_dep_flag: Default::default(), - sync_download_queue: Self::create_sync_download_queue(), - } - } - - fn create_sync_download_queue() -> Option<Arc<TaskQueue>> { - if crate::npm::should_sync_download() { - Some(Default::default()) - } else { - None } } @@ -314,21 +302,12 @@ impl NpmResolver for CliGraphResolver { // this will internally cache the package information let package_name = package_name.to_string(); let api = self.npm_registry_api.clone(); - let maybe_sync_download_queue = self.sync_download_queue.clone(); async move { - let permit = if let Some(task_queue) = &maybe_sync_download_queue { - Some(task_queue.acquire().await) - } else { - None - }; - - let result = api + api .package_info(&package_name) .await .map(|_| ()) - .map_err(|err| err.into()); - drop(permit); - result + .map_err(|err| err.into()) } .boxed() } |