From 5b4a9b48aeabded174cc161bfdafb6529cffbca1 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 24 Apr 2023 21:07:48 -0400 Subject: refactor(ext/node): enforce interior mutable for `NodePermissions` to remove clones (#18831) We can make `NodePermissions` rely on interior mutability (which the `PermissionsContainer` is already doing) in order to not have to clone everything all the time. This also reduces the chance of an accidental `borrow` while `borrrow_mut`. --- cli/npm/resolvers/common.rs | 4 ++-- cli/npm/resolvers/global.rs | 2 +- cli/npm/resolvers/local.rs | 2 +- cli/npm/resolvers/mod.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cli/npm/resolvers') diff --git a/cli/npm/resolvers/common.rs b/cli/npm/resolvers/common.rs index a31459a70..ccba00d43 100644 --- a/cli/npm/resolvers/common.rs +++ b/cli/npm/resolvers/common.rs @@ -47,7 +47,7 @@ pub trait NpmPackageFsResolver: Send + Sync { fn ensure_read_permission( &self, - permissions: &mut dyn NodePermissions, + permissions: &dyn NodePermissions, path: &Path, ) -> Result<(), AnyError>; } @@ -90,7 +90,7 @@ pub async fn cache_packages( } pub fn ensure_registry_read_permission( - permissions: &mut dyn NodePermissions, + permissions: &dyn NodePermissions, registry_path: &Path, path: &Path, ) -> Result<(), AnyError> { diff --git a/cli/npm/resolvers/global.rs b/cli/npm/resolvers/global.rs index 66935380f..79df16187 100644 --- a/cli/npm/resolvers/global.rs +++ b/cli/npm/resolvers/global.rs @@ -126,7 +126,7 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver { fn ensure_read_permission( &self, - permissions: &mut dyn NodePermissions, + permissions: &dyn NodePermissions, path: &Path, ) -> Result<(), AnyError> { let registry_path = self.cache.registry_folder(&self.registry_url); diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index e2919f6ee..f5385c2f1 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -206,7 +206,7 @@ impl NpmPackageFsResolver for LocalNpmPackageResolver { fn ensure_read_permission( &self, - permissions: &mut dyn NodePermissions, + permissions: &dyn NodePermissions, path: &Path, ) -> Result<(), AnyError> { ensure_registry_read_permission( diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index fa83cdf59..60402bd27 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -262,7 +262,7 @@ impl NpmResolver for CliNpmResolver { fn ensure_read_permission( &self, - permissions: &mut dyn NodePermissions, + permissions: &dyn NodePermissions, path: &Path, ) -> Result<(), AnyError> { self.fs_resolver.ensure_read_permission(permissions, path) -- cgit v1.2.3