diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-05-08 11:02:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-08 11:02:02 -0400 |
commit | df1ca4a158eda08846e11ceb03dd68d6fcffda75 (patch) | |
tree | a2c3f2922a3b6326d223e079e3acbedb95048918 /ext/node/resolution.rs | |
parent | 0aa2d7c9c16c514e47bbd07ca90552f9159901ef (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/resolution.rs')
-rw-r--r-- | ext/node/resolution.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 71b988c19..16720f22c 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -2,7 +2,6 @@ use std::path::Path; use std::path::PathBuf; -use std::sync::Arc; use deno_core::anyhow::bail; use deno_core::anyhow::Context; @@ -12,6 +11,7 @@ use deno_core::serde_json::Map; use deno_core::serde_json::Value; use deno_core::url::Url; use deno_core::ModuleSpecifier; +use deno_fs::FileSystemRc; use deno_media_type::MediaType; use deno_semver::npm::NpmPackageNv; use deno_semver::npm::NpmPackageNvReference; @@ -20,7 +20,7 @@ use deno_semver::npm::NpmPackageReqReference; use crate::errors; use crate::AllowAllNodePermissions; use crate::NodePermissions; -use crate::NpmResolver; +use crate::NpmResolverRc; use crate::PackageJson; use crate::PathClean; @@ -104,17 +104,17 @@ impl NodeResolution { } } +#[allow(clippy::disallowed_types)] +pub type NodeResolverRc = deno_fs::sync::MaybeArc<NodeResolver>; + #[derive(Debug)] pub struct NodeResolver { - fs: Arc<dyn deno_fs::FileSystem>, - npm_resolver: Arc<dyn NpmResolver>, + fs: FileSystemRc, + npm_resolver: NpmResolverRc, } impl NodeResolver { - pub fn new( - fs: Arc<dyn deno_fs::FileSystem>, - npm_resolver: Arc<dyn NpmResolver>, - ) -> Self { + pub fn new(fs: FileSystemRc, npm_resolver: NpmResolverRc) -> Self { Self { fs, npm_resolver } } |