summaryrefslogtreecommitdiff
path: root/cli/npm
diff options
context:
space:
mode:
author林炳权 <695601626@qq.com>2023-08-27 12:04:12 +0800
committerGitHub <noreply@github.com>2023-08-26 22:04:12 -0600
commit2080669943e79aba619bc80829172c696ec1f15c (patch)
tree9eb317754a9632220abb3df238a30375164d705a /cli/npm
parente4cebf3e0da539321727b0f0e43ddce5679635b1 (diff)
chore: update to Rust 1.72 (#20258)
<!-- Before submitting a PR, please read https://deno.com/manual/contributing 1. Give the PR a descriptive title. Examples of good title: - fix(std/http): Fix race condition in server - docs(console): Update docstrings - feat(doc): Handle nested reexports Examples of bad title: - fix #7123 - update docs - fix bugs 2. Ensure there is a related issue and it is referenced in the PR text. 3. Ensure there are tests that cover the changes. 4. Ensure `cargo test` passes. 5. Ensure `./tools/format.js` passes without changing files. 6. Ensure `./tools/lint.js` passes. 7. Open as a draft PR if your work is still in progress. The CI won't run all steps, but you can add '[ci]' to a commit message to force it to. 8. If you would like to run the benchmarks on the CI, add the 'ci-bench' label. --> As the title. --------- Co-authored-by: Matt Mastracci <matthew@mastracci.com>
Diffstat (limited to 'cli/npm')
-rw-r--r--cli/npm/resolvers/global.rs15
-rw-r--r--cli/npm/resolvers/local.rs8
-rw-r--r--cli/npm/resolvers/mod.rs14
3 files changed, 22 insertions, 15 deletions
diff --git a/cli/npm/resolvers/global.rs b/cli/npm/resolvers/global.rs
index 1181403b2..e1144f610 100644
--- a/cli/npm/resolvers/global.rs
+++ b/cli/npm/resolvers/global.rs
@@ -100,9 +100,10 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver {
) -> Result<PathBuf, AnyError> {
let Some(referrer_pkg_id) = self
.cache
- .resolve_package_folder_id_from_specifier(referrer, &self.registry_url) else {
- bail!("could not find npm package for '{}'", referrer);
- };
+ .resolve_package_folder_id_from_specifier(referrer, &self.registry_url)
+ else {
+ bail!("could not find npm package for '{}'", referrer);
+ };
let pkg = if mode.is_types() && !name.starts_with("@types/") {
// attempt to resolve the types package first, then fallback to the regular package
match self.resolve_types_package(name, &referrer_pkg_id) {
@@ -123,10 +124,10 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver {
&self,
specifier: &ModuleSpecifier,
) -> Result<Option<PathBuf>, AnyError> {
- let Some(pkg_folder_id) = self.cache.resolve_package_folder_id_from_specifier(
- specifier,
- &self.registry_url,
- ) else {
+ let Some(pkg_folder_id) = self
+ .cache
+ .resolve_package_folder_id_from_specifier(specifier, &self.registry_url)
+ else {
return Ok(None);
};
Ok(Some(
diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs
index 74b797309..f8d7c2848 100644
--- a/cli/npm/resolvers/local.rs
+++ b/cli/npm/resolvers/local.rs
@@ -110,7 +110,9 @@ impl LocalNpmPackageResolver {
&self,
specifier: &ModuleSpecifier,
) -> Result<Option<PathBuf>, AnyError> {
- let Some(relative_url) = self.root_node_modules_url.make_relative(specifier) else {
+ let Some(relative_url) =
+ self.root_node_modules_url.make_relative(specifier)
+ else {
return Ok(None);
};
if relative_url.starts_with("../") {
@@ -230,7 +232,9 @@ impl NpmPackageFsResolver for LocalNpmPackageResolver {
&self,
specifier: &ModuleSpecifier,
) -> Result<Option<NpmPackageCacheFolderId>, AnyError> {
- let Some(folder_path) = self.resolve_package_folder_from_specifier(specifier)? else {
+ let Some(folder_path) =
+ self.resolve_package_folder_from_specifier(specifier)?
+ else {
return Ok(None);
};
let folder_name = folder_path.parent().unwrap().to_string_lossy();
diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs
index 58a70dff0..9f714256d 100644
--- a/cli/npm/resolvers/mod.rs
+++ b/cli/npm/resolvers/mod.rs
@@ -135,9 +135,10 @@ impl CliNpmResolver {
) -> Result<Option<PathBuf>, AnyError> {
let Some(path) = self
.fs_resolver
- .resolve_package_folder_from_specifier(specifier)? else {
- return Ok(None);
- };
+ .resolve_package_folder_from_specifier(specifier)?
+ else {
+ return Ok(None);
+ };
log::debug!(
"Resolved package folder of {} to {}",
specifier,
@@ -153,9 +154,10 @@ impl CliNpmResolver {
) -> Result<Option<NpmPackageId>, AnyError> {
let Some(cache_folder_id) = self
.fs_resolver
- .resolve_package_cache_folder_id_from_specifier(specifier)? else {
- return Ok(None);
- };
+ .resolve_package_cache_folder_id_from_specifier(specifier)?
+ else {
+ return Ok(None);
+ };
Ok(Some(
self
.resolution