diff options
Diffstat (limited to 'crates/shirabe/src/command/package_discovery_trait.rs')
| -rw-r--r-- | crates/shirabe/src/command/package_discovery_trait.rs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index d0574c6..e43f401 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -15,7 +15,7 @@ use shirabe_php_shim::{ trim, }; -use crate::composer::PartialComposerHandle; +use crate::composer::{AnyComposerHandle, PartialComposer}; use crate::factory::Factory; use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; @@ -40,12 +40,12 @@ pub trait PackageDiscoveryTrait { // PHP: trait dependencies (provided by BaseCommand) fn get_io(&self) -> std::rc::Rc<std::cell::RefCell<dyn IOInterface>>; - fn try_composer(&self) -> Option<PartialComposerHandle>; + fn try_composer(&self) -> Option<AnyComposerHandle>; fn require_composer( &self, disable_plugins: Option<bool>, disable_scripts: Option<bool>, - ) -> PartialComposerHandle; + ) -> AnyComposerHandle; fn get_platform_requirement_filter( &self, input: &dyn InputInterface, @@ -218,10 +218,7 @@ pub trait PackageDiscoveryTrait { // Collect existing packages let composer = self.try_composer(); - let composer_ref = composer.as_ref().map(|c| c.borrow_partial()); - let repository_manager = composer_ref - .as_ref() - .map(|c| c.get_repository_manager().clone()); + let repository_manager = composer.as_ref().map(|c| c.get_repository_manager()); let repository_manager_ref = repository_manager.as_ref().map(|rm| rm.borrow()); let installed_repo = repository_manager_ref .as_ref() @@ -236,7 +233,6 @@ pub trait PackageDiscoveryTrait { drop(installed_repo); drop(repository_manager_ref); drop(repository_manager); - drop(composer_ref); drop(composer); let io = self.get_io(); @@ -816,8 +812,7 @@ pub trait PackageDiscoveryTrait { let mut similar_packages: IndexMap<String, i64> = IndexMap::new(); let composer_for_installed = self.require_composer(None, None); - let composer_for_installed = composer_for_installed.borrow_partial(); - let repository_manager = composer_for_installed.get_repository_manager().clone(); + let repository_manager = composer_for_installed.get_repository_manager(); let repository_manager = repository_manager.borrow(); let installed_repo = repository_manager.get_local_repository(); |