diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-05-05 12:44:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-05 16:44:24 +0000 |
| commit | a6c47ee74023f6ef683988cabc8caa95406e3c99 (patch) | |
| tree | 74026c558a175b9cf6f881ec7229499878dd6a1a /ext/node/analyze.rs | |
| parent | 5270c43e412cc636cd9923182169d166d181f78a (diff) | |
refactor(ext/node): combine `deno_node::Fs` with `deno_fs::FileSystem` (#18991)
Diffstat (limited to 'ext/node/analyze.rs')
| -rw-r--r-- | ext/node/analyze.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/node/analyze.rs b/ext/node/analyze.rs index 2622ce8da..bad0906c5 100644 --- a/ext/node/analyze.rs +++ b/ext/node/analyze.rs @@ -13,7 +13,6 @@ use once_cell::sync::Lazy; use deno_core::error::AnyError; -use crate::NodeFs; use crate::NodeModuleKind; use crate::NodePermissions; use crate::NodeResolutionMode; @@ -67,7 +66,7 @@ pub trait CjsEsmCodeAnalyzer { pub struct NodeCodeTranslator<TCjsEsmCodeAnalyzer: CjsEsmCodeAnalyzer> { cjs_esm_code_analyzer: TCjsEsmCodeAnalyzer, - fs: Arc<dyn NodeFs>, + fs: Arc<dyn deno_fs::FileSystem>, node_resolver: Arc<NodeResolver>, npm_resolver: Arc<dyn NpmResolver>, } @@ -77,7 +76,7 @@ impl<TCjsEsmCodeAnalyzer: CjsEsmCodeAnalyzer> { pub fn new( cjs_esm_code_analyzer: TCjsEsmCodeAnalyzer, - fs: Arc<dyn NodeFs>, + fs: Arc<dyn deno_fs::FileSystem>, node_resolver: Arc<NodeResolver>, npm_resolver: Arc<dyn NpmResolver>, ) -> Self { @@ -161,6 +160,7 @@ impl<TCjsEsmCodeAnalyzer: CjsEsmCodeAnalyzer> let reexport_file_text = self .fs .read_to_string(&resolved_reexport) + .map_err(AnyError::from) .with_context(|| { format!( "Could not find '{}' ({}) referenced from {}", |