summaryrefslogtreecommitdiff
path: root/ext/node/resolution.rs
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 /ext/node/resolution.rs
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 'ext/node/resolution.rs')
-rw-r--r--ext/node/resolution.rs24
1 files changed, 14 insertions, 10 deletions
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs
index 4272b8c86..7a88356d8 100644
--- a/ext/node/resolution.rs
+++ b/ext/node/resolution.rs
@@ -1053,9 +1053,10 @@ impl NodeResolver {
// ResolveSelf
let Some(package_config) =
- self.get_package_scope_config(referrer, permissions)? else {
- return Ok(None);
- };
+ self.get_package_scope_config(referrer, permissions)?
+ else {
+ return Ok(None);
+ };
if package_config.exists
&& package_config.name.as_ref() == Some(&package_name)
{
@@ -1132,9 +1133,10 @@ impl NodeResolver {
) -> Result<Option<PackageJson>, AnyError> {
let Some(root_folder) = self
.npm_resolver
- .resolve_package_folder_from_path(&referrer.to_file_path().unwrap())? else {
- return Ok(None);
- };
+ .resolve_package_folder_from_path(&referrer.to_file_path().unwrap())?
+ else {
+ return Ok(None);
+ };
let package_json_path = root_folder.join("package.json");
self
.load_package_json(permissions, package_json_path)
@@ -1146,7 +1148,8 @@ impl NodeResolver {
url: &ModuleSpecifier,
permissions: &dyn NodePermissions,
) -> Result<Option<PackageJson>, AnyError> {
- let Some(package_json_path) = self.get_closest_package_json_path(url)? else {
+ let Some(package_json_path) = self.get_closest_package_json_path(url)?
+ else {
return Ok(None);
};
self
@@ -1169,9 +1172,10 @@ impl NodeResolver {
}
let Some(root_pkg_folder) = self
.npm_resolver
- .resolve_package_folder_from_path(current_dir)? else {
- return Ok(None);
- };
+ .resolve_package_folder_from_path(current_dir)?
+ else {
+ return Ok(None);
+ };
while current_dir.starts_with(&root_pkg_folder) {
current_dir = current_dir.parent().unwrap();
let package_json_path = current_dir.join("package.json");