summaryrefslogtreecommitdiff
path: root/ext/node/analyze.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-05-08 11:02:02 -0400
committerGitHub <noreply@github.com>2023-05-08 11:02:02 -0400
commitdf1ca4a158eda08846e11ceb03dd68d6fcffda75 (patch)
treea2c3f2922a3b6326d223e079e3acbedb95048918 /ext/node/analyze.rs
parent0aa2d7c9c16c514e47bbd07ca90552f9159901ef (diff)
refactor(ext/fs): `deno_fs::FileSystem` - conditional `Send + Sync` (#18993)
This allows for having a conditional `Send + Sync` on the file system trait for Deploy.
Diffstat (limited to 'ext/node/analyze.rs')
-rw-r--r--ext/node/analyze.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/ext/node/analyze.rs b/ext/node/analyze.rs
index bad0906c5..6d32c68be 100644
--- a/ext/node/analyze.rs
+++ b/ext/node/analyze.rs
@@ -5,7 +5,6 @@ use std::collections::VecDeque;
use std::fmt::Write;
use std::path::Path;
use std::path::PathBuf;
-use std::sync::Arc;
use deno_core::anyhow::Context;
use deno_core::ModuleSpecifier;
@@ -13,11 +12,11 @@ use once_cell::sync::Lazy;
use deno_core::error::AnyError;
+use crate::resolution::NodeResolverRc;
use crate::NodeModuleKind;
use crate::NodePermissions;
use crate::NodeResolutionMode;
-use crate::NodeResolver;
-use crate::NpmResolver;
+use crate::NpmResolverRc;
use crate::PackageJson;
use crate::PathClean;
use crate::NODE_GLOBAL_THIS_NAME;
@@ -66,9 +65,9 @@ pub trait CjsEsmCodeAnalyzer {
pub struct NodeCodeTranslator<TCjsEsmCodeAnalyzer: CjsEsmCodeAnalyzer> {
cjs_esm_code_analyzer: TCjsEsmCodeAnalyzer,
- fs: Arc<dyn deno_fs::FileSystem>,
- node_resolver: Arc<NodeResolver>,
- npm_resolver: Arc<dyn NpmResolver>,
+ fs: deno_fs::FileSystemRc,
+ node_resolver: NodeResolverRc,
+ npm_resolver: NpmResolverRc,
}
impl<TCjsEsmCodeAnalyzer: CjsEsmCodeAnalyzer>
@@ -76,9 +75,9 @@ impl<TCjsEsmCodeAnalyzer: CjsEsmCodeAnalyzer>
{
pub fn new(
cjs_esm_code_analyzer: TCjsEsmCodeAnalyzer,
- fs: Arc<dyn deno_fs::FileSystem>,
- node_resolver: Arc<NodeResolver>,
- npm_resolver: Arc<dyn NpmResolver>,
+ fs: deno_fs::FileSystemRc,
+ node_resolver: NodeResolverRc,
+ npm_resolver: NpmResolverRc,
) -> Self {
Self {
cjs_esm_code_analyzer,