From a6c47ee74023f6ef683988cabc8caa95406e3c99 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 5 May 2023 12:44:24 -0400
Subject: refactor(ext/node): combine `deno_node::Fs` with
 `deno_fs::FileSystem` (#18991)

---
 ext/node/package_json.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'ext/node/package_json.rs')

diff --git a/ext/node/package_json.rs b/ext/node/package_json.rs
index 940e32631..95ca8b561 100644
--- a/ext/node/package_json.rs
+++ b/ext/node/package_json.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 
-use crate::NodeFs;
 use crate::NodeModuleKind;
 use crate::NodePermissions;
 
@@ -63,7 +62,7 @@ impl PackageJson {
   }
 
   pub fn load(
-    fs: &dyn NodeFs,
+    fs: &dyn deno_fs::FileSystem,
     resolver: &dyn NpmResolver,
     permissions: &dyn NodePermissions,
     path: PathBuf,
@@ -73,7 +72,7 @@ impl PackageJson {
   }
 
   pub fn load_skip_read_permission(
-    fs: &dyn NodeFs,
+    fs: &dyn deno_fs::FileSystem,
     path: PathBuf,
   ) -> Result<PackageJson, AnyError> {
     assert!(path.is_absolute());
@@ -90,7 +89,7 @@ impl PackageJson {
       Err(err) => bail!(
         "Error loading package.json at {}. {:#}",
         path.display(),
-        err
+        AnyError::from(err),
       ),
     };
 
-- 
cgit v1.2.3