diff options
27 files changed, 54 insertions, 64 deletions
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 3b27b4c..c2e9070 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -218,7 +218,7 @@ impl ArchiveCommand { ignore_filters: bool, composer: Option<&PartialComposerHandle>, ) -> Result<i64> { - let composer_guard = composer.map(crate::command::composer_full); + let composer_guard = composer.map(crate::composer::composer_full); let mut owned_archive_manager; let composer_archive_manager; let mut composer_archive_manager_ref; @@ -256,7 +256,7 @@ impl ArchiveCommand { } } else { let rc = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&rc); + let composer = crate::composer::composer_full(&rc); composer.get_package().clone().into() }; @@ -299,7 +299,7 @@ impl ArchiveCommand { let repo; if let Some(composer) = self.try_composer(None, None) { - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let repository_manager = composer.get_repository_manager().clone(); let repository_manager = repository_manager.borrow(); let local_repo = repository_manager.get_local_repository(); diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index e5dc231..0cf64a3 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -127,7 +127,7 @@ impl Command for AuditCommand { return Ok(0); } - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let auditor = Auditor; let mut repo_set = RepositorySet::new( "stable", @@ -245,7 +245,7 @@ impl AuditCommand { composer: &PartialComposerHandle, input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>>, ) -> Result<Vec<crate::package::PackageInterfaceHandle>> { - let composer = crate::command::composer_full_mut(composer); + let composer = crate::composer::composer_full(composer); if input .borrow() .get_option("locked")? diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs index ccae039..8404dec 100644 --- a/crates/shirabe/src/command/base_dependency_command.rs +++ b/crates/shirabe/src/command/base_dependency_command.rs @@ -44,7 +44,7 @@ pub trait BaseDependencyCommand: BaseCommand { inverted: bool, ) -> anyhow::Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); // TODO(plugin): dispatch CommandEvent(PluginEvents::COMMAND, self.get_name(), input, output) via composer.get_event_dispatcher() let mut repos: Vec<crate::repository::RepositoryInterfaceHandle> = diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index 90947ef..f86b29a 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -100,7 +100,7 @@ impl BumpCommand { } let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); let has_lock_file_disabled = !composer.get_config().borrow().has("lock") || composer .get_config() diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index d3e8adc..ee98aa8 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -195,7 +195,7 @@ impl Command for CheckPlatformReqsCommand { _output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); let io = self.get_io(); let no_dev = input diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index dbc98dd..ab45400 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -372,11 +372,11 @@ impl CreateProjectCommand { && add_repository { for (index, repo) in repos.iter().enumerate() { - let config = crate::command::composer_full(&composer_handle).get_config(); + let config = crate::composer::composer_full(&composer_handle).get_config(); let repo_config = RepositoryFactory::config_from_string(io.clone(), &config, repo, true)?; let composer_json_repositories_config = - crate::command::composer_full(&composer_handle) + crate::composer::composer_full(&composer_handle) .get_config() .borrow() .get_repositories(); @@ -426,7 +426,7 @@ impl CreateProjectCommand { } } - let composer = crate::command::composer_full_mut(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); let process = composer .get_loop() @@ -804,7 +804,7 @@ impl CreateProjectCommand { disable_plugins, Some(disable_scripts), )?; - let composer = crate::command::composer_full(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); let config = composer.get_config(); // set the base dir here again on the new config instance, as otherwise in case the vendor dir is defined in an env var for example it would still override the value set above by $config->all() config.borrow_mut().set_base_dir(Some(directory.clone())); diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index 514671a..37009fb 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -108,7 +108,7 @@ impl Command for DiagnoseCommand { let config: std::rc::Rc<std::cell::RefCell<Config>>; if let Some(ref mut c) = composer { - let c = crate::command::composer_full(c); + let c = crate::composer::composer_full(c); config = c.get_config().clone(); let command_event = CommandEvent::new6( @@ -267,7 +267,7 @@ impl Command for DiagnoseCommand { )); if let Some(ref mut c) = composer { - let c = crate::command::composer_full_mut(c); + let c = crate::composer::composer_full(c); io.write(&format!( "Active plugins: {}", implode( diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs index d697e79..d9e9973 100644 --- a/crates/shirabe/src/command/dump_autoload_command.rs +++ b/crates/shirabe/src/command/dump_autoload_command.rs @@ -70,7 +70,7 @@ impl Command for DumpAutoloadCommand { output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); // TODO(plugin): dispatch CommandEvent let command_event = CommandEvent::new( diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index 2fc23f0..8f3a0b5 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -39,7 +39,7 @@ impl ExecCommand { fn get_binaries(&self, for_display: bool) -> Result<Vec<String>> { let composer = self.require_composer(None, None)?; - let composer_ref = crate::command::composer_full_mut(&composer); + let composer_ref = crate::composer::composer_full(&composer); let bin_dir = composer_ref .get_config() .borrow_mut() @@ -155,7 +155,7 @@ impl Command for ExecCommand { { let bins = self.get_binaries(true)?; if bins.is_empty() { - let bin_dir = crate::command::composer_full_mut(&composer) + let bin_dir = crate::composer::composer_full(&composer) .get_config() .borrow_mut() .get("bin-dir") @@ -188,7 +188,7 @@ impl Command for ExecCommand { .unwrap_or("") .to_string(); - let dispatcher = crate::command::composer_full(&composer) + let dispatcher = crate::composer::composer_full(&composer) .get_event_dispatcher() .clone(); dispatcher.borrow_mut().add_listener( diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs index 8c43ca1..7e3bf65 100644 --- a/crates/shirabe/src/command/fund_command.rs +++ b/crates/shirabe/src/command/fund_command.rs @@ -103,7 +103,7 @@ impl Command for FundCommand { _output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let repository_manager = composer.get_repository_manager().clone(); let repository_manager = repository_manager.borrow(); diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index 0a0a36c..bde9fc2 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -111,7 +111,7 @@ impl HomeCommand { let composer = self.try_composer(None, None); if let Some(composer) = composer { - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let mut repos: Vec<crate::repository::RepositoryInterfaceHandle> = vec![]; repos.push(crate::repository::RepositoryInterfaceHandle::new( RootPackageRepository::new(crate::package::RootPackageInterfaceHandle::dup( @@ -199,7 +199,7 @@ impl Command for HomeCommand { let packages = if packages.is_empty() { io.write_error("No package specified, opening homepage for the root package"); let composer_rc = self.require_composer(None, None)?; - let composer_ref = crate::command::composer_full(&composer_rc); + let composer_ref = crate::composer::composer_full(&composer_rc); vec![composer_ref.get_package().get_name().to_string()] } else { packages diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 6a56eb0..de0f400 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -132,7 +132,7 @@ impl Command for InstallCommand { } let composer_handle = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); if !composer.get_locker().borrow_mut().is_locked() && !HttpDownloader::is_curl_enabled() { io.write_error("<warning>Composer is operating significantly slower than normal because you do not have the PHP curl extension enabled.</warning>"); diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index bef15ff..cae79e4 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -112,7 +112,7 @@ impl Command for LicensesCommand { .borrow_mut() .dispatch(Some(command_event.get_name()), None); - let composer = crate::command::composer_full_mut(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); let root = composer.get_package(); let packages = if input diff --git a/crates/shirabe/src/command/mod.rs b/crates/shirabe/src/command/mod.rs index 4452f85..614fff7 100644 --- a/crates/shirabe/src/command/mod.rs +++ b/crates/shirabe/src/command/mod.rs @@ -37,8 +37,6 @@ pub mod suggests_command; pub mod update_command; pub mod validate_command; -pub(crate) use crate::composer::{composer_full, composer_full_mut}; - pub use about_command::*; pub use archive_command::*; pub use audit_command::*; diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index 20b8895..b1d74cc 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -84,7 +84,7 @@ impl Command for ReinstallCommand { output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let io = self.get_io(); let repository_manager = composer.get_repository_manager().clone(); diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index 60287bc..f864ebe 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -218,7 +218,7 @@ impl Command for RemoveCommand { .unwrap_or(false) { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); { let locker = composer.get_locker().clone(); let mut locker = locker.borrow_mut(); @@ -475,7 +475,7 @@ impl Command for RemoveCommand { // TODO(plugin): deactivate installed plugins if let Some(composer_opt) = self.try_composer(None, None) { - let composer_opt = crate::command::composer_full(&composer_opt); + let composer_opt = crate::composer::composer_full(&composer_opt); composer_opt .get_plugin_manager() .borrow_mut() @@ -484,7 +484,7 @@ impl Command for RemoveCommand { self.reset_composer(); let composer_handle = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); if dry_run { let root_package = composer.get_package(); diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index d2923c8..4f50e71 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -278,7 +278,7 @@ impl Command for RequireCommand { } let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let repository_manager = composer.get_repository_manager().clone(); let repository_manager = repository_manager.borrow(); let repos = repository_manager.get_repositories(); @@ -753,7 +753,7 @@ impl RequireCommand { // Update packages self.reset_composer()?; let composer_handle = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); self.dependency_resolution_completed.set(false); // PHP: $composer->getEventDispatcher()->addListener(InstallerEvents::PRE_OPERATIONS_EXEC, @@ -1056,7 +1056,7 @@ impl RequireCommand { fixed: bool, ) -> Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); let locker_is_locked = composer.get_locker().borrow_mut().is_locked(); let mut requirements: IndexMap<String, String> = IndexMap::new(); let mut version_selector = VersionSelector::new( diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index 7d37959..a85bb4e 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -84,7 +84,7 @@ impl RunScriptCommand { fn get_scripts(&self) -> Result<Vec<(String, String)>> { let composer = self.require_composer(None, None)?; - let scripts = crate::command::composer_full(&composer) + let scripts = crate::composer::composer_full(&composer) .get_package() .get_scripts(); drop(composer); @@ -257,7 +257,7 @@ impl Command for RunScriptCommand { } let composer = self.require_composer(None, None)?; - let dispatcher = crate::command::composer_full(&composer) + let dispatcher = crate::composer::composer_full(&composer) .get_event_dispatcher() .clone(); let dev_mode = input.borrow().get_option("dev")?.as_bool().unwrap_or(false) diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs index e429fe7..9f55b03 100644 --- a/crates/shirabe/src/command/script_alias_command.rs +++ b/crates/shirabe/src/command/script_alias_command.rs @@ -110,7 +110,7 @@ impl Command for ScriptAliasCommand { _output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { let composer = self.require_composer(None, None)?; - let dispatcher = crate::command::composer_full(&composer) + let dispatcher = crate::composer::composer_full(&composer) .get_event_dispatcher() .clone(); diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index f5a85fe..f902eb8 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -138,7 +138,7 @@ impl Command for SearchCommand { } else { self.create_composer_instance(input.clone(), io.clone(), None, false, None)? }; - let composer_ref = crate::command::composer_full(&composer); + let composer_ref = crate::composer::composer_full(&composer); let local_repo = composer_ref .get_repository_manager() .borrow() diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index f65ecc7..fa9c3d9 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -324,7 +324,7 @@ impl Command for ShowCommand { // init repos let mut platform_overrides: IndexMap<String, PhpMixed> = IndexMap::new(); if let Some(ref composer) = composer { - let composer = crate::command::composer_full(composer); + let composer = crate::composer::composer_full(composer); if let Some(p) = composer .get_config() .borrow() @@ -387,7 +387,7 @@ impl Command for ShowCommand { } else if input.borrow().get_option("available")?.as_bool() == Some(true) { let mut ir = InstalledRepository::new(vec![platform_repo.clone().into()]); if let Some(ref composer) = composer { - let composer = crate::command::composer_full(composer); + let composer = crate::composer::composer_full(composer); repos = RepositoryInterfaceHandle::new(CompositeRepository::new( composer .get_repository_manager() @@ -416,7 +416,7 @@ impl Command for ShowCommand { installed_repo = RepositoryInterfaceHandle::new(ir); } } else if input.borrow().get_option("all")?.as_bool() == Some(true) && composer.is_some() { - let composer_ref = crate::command::composer_full_mut(composer.as_ref().unwrap()); + let composer_ref = crate::composer::composer_full(composer.as_ref().unwrap()); let local_repo = composer_ref .get_repository_manager() .borrow() @@ -473,7 +473,7 @@ impl Command for ShowCommand { repos = RepositoryInterfaceHandle::new(CompositeRepository::new(composite_input)); } else if input.borrow().get_option("locked")?.as_bool() == Some(true) { if composer.is_none() - || !crate::command::composer_full_mut(composer.as_ref().unwrap()) + || !crate::composer::composer_full(composer.as_ref().unwrap()) .get_locker() .borrow_mut() .is_locked() @@ -484,7 +484,7 @@ impl Command for ShowCommand { } .into()); } - let composer_ref = crate::command::composer_full_mut(composer.as_ref().unwrap()); + let composer_ref = crate::composer::composer_full(composer.as_ref().unwrap()); let locker_rc = composer_ref.get_locker().clone(); let mut locker = locker_rc.borrow_mut(); let lr = locker.get_locked_repository( @@ -508,12 +508,12 @@ impl Command for ShowCommand { let _guard_from_existing; let composer_local = match composer.as_ref() { Some(c) => { - _guard_from_existing = crate::command::composer_full(c); + _guard_from_existing = crate::composer::composer_full(c); &*_guard_from_existing } None => { composer_local_owned = self.require_composer(None, None)?; - _guard_from_existing = crate::command::composer_full(&composer_local_owned); + _guard_from_existing = crate::composer::composer_full(&composer_local_owned); &*_guard_from_existing } }; @@ -586,7 +586,7 @@ impl Command for ShowCommand { } if let Some(ref composer) = composer { - let composer = crate::command::composer_full(composer); + let composer = crate::composer::composer_full(composer); let mut command_event = CommandEvent::new6( PluginEvents::COMMAND, "show", @@ -1629,7 +1629,7 @@ impl ShowCommand { None => return vec![], Some(c) => c, }; - let composer = crate::command::composer_full(&composer_rc); + let composer = crate::composer::composer_full(&composer_rc); let root_package = composer.get_package(); @@ -2741,7 +2741,7 @@ impl ShowCommand { // find the latest version allowed in this repo set let name = package.get_name(); let repo_set = self.get_repository_set(composer)?; - let composer_ref = crate::command::composer_full(composer); + let composer_ref = crate::composer::composer_full(composer); let mut version_selector = VersionSelector::new(repo_set, Some(&mut *platform_repo.borrow_mut()))?; let mut stability = composer_ref @@ -2862,7 +2862,7 @@ impl ShowCommand { &self, composer: &PartialComposerHandle, ) -> anyhow::Result<std::rc::Rc<std::cell::RefCell<RepositorySet>>> { - let composer = crate::command::composer_full(composer); + let composer = crate::composer::composer_full(composer); if self.repository_set.borrow().is_none() { let mut rs = RepositorySet::new( &composer.get_package().get_minimum_stability(), diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index a8ea1ee..74a85b4 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -52,7 +52,7 @@ impl StatusCommand { input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>>, ) -> Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); let io = self.get_io().clone(); let mut errors: IndexMap<String, String> = IndexMap::new(); @@ -342,7 +342,7 @@ impl Command for StatusCommand { ) -> anyhow::Result<i64> { let composer_rc = self.require_composer(None, None)?; { - let composer = crate::command::composer_full(&composer_rc); + let composer = crate::composer::composer_full(&composer_rc); // TODO(plugin): dispatch CommandEvent let command_event = @@ -366,7 +366,7 @@ impl Command for StatusCommand { let exit_code = self.do_execute(input)?; { - let composer = crate::command::composer_full(&composer_rc); + let composer = crate::composer::composer_full(&composer_rc); composer .get_event_dispatcher() .borrow_mut() diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index 9abae53..25b2e92 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -114,7 +114,7 @@ impl Command for SuggestsCommand { _output: Rc<RefCell<dyn OutputInterface>>, ) -> Result<i64> { let composer = self.require_composer(None, None)?; - let composer = crate::command::composer_full_mut(&composer); + let composer = crate::composer::composer_full(&composer); let mut installed_repos: Vec<RepositoryInterfaceHandle> = vec![RepositoryInterfaceHandle::new(RootPackageRepository::new( diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 6a74371..d22fbec 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -117,7 +117,7 @@ impl Command for UpdateCommand { } let composer_handle = self.require_composer(None, None)?; - let composer = crate::command::composer_full(&composer_handle); + let composer = crate::composer::composer_full(&composer_handle); if !HttpDownloader::is_curl_enabled() { io.write_error3( @@ -578,7 +578,7 @@ impl UpdateCommand { .into()); } - let composer_ref = crate::command::composer_full(composer); + let composer_ref = crate::composer::composer_full(composer); let platform_req_filter = self.get_platform_requirement_filter(input); let stability_flags = composer_ref.get_package().get_stability_flags(); let requires = array_merge_map( @@ -715,7 +715,7 @@ impl UpdateCommand { } fn create_version_selector(&self, composer: &PartialComposerHandle) -> Result<VersionSelector> { - let composer = crate::command::composer_full(composer); + let composer = crate::composer::composer_full(composer); let root_aliases: Vec<crate::repository::RootAliasInput> = composer .get_package() .get_aliases() diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index f44a942..fc9a7df 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -197,7 +197,7 @@ impl Command for ValidateCommand { let mut lock_errors: Vec<String> = vec![]; let composer = self.create_composer_instance(input.clone(), io.clone(), None, false, None)?; - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let check_lock = (check_lock && composer .get_config() diff --git a/crates/shirabe/src/composer.rs b/crates/shirabe/src/composer.rs index 56f1d3b..57b4c6c 100644 --- a/crates/shirabe/src/composer.rs +++ b/crates/shirabe/src/composer.rs @@ -557,11 +557,3 @@ pub fn composer_full(composer: &PartialComposerHandle) -> std::cell::Ref<'_, Com .expect("a fully loaded Composer is required here") }) } - -/// Mutably borrows a polymorphic `PartialComposer` as a fully-loaded `Composer`. See [`composer_full`]. -pub fn composer_full_mut(composer: &PartialComposerHandle) -> std::cell::RefMut<'_, Composer> { - std::cell::RefMut::map(composer.as_rc().borrow_mut(), |c| { - c.as_full_mut() - .expect("a fully loaded Composer is required here") - }) -} diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 5092640..d34a736 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -2390,7 +2390,7 @@ impl ApplicationHandle { let composer_opt = application.borrow_mut().get_composer(false, None, None)?; if let Some(composer) = composer_opt { - let composer = crate::command::composer_full(&composer); + let composer = crate::composer::composer_full(&composer); let root_package = composer.get_package(); let generator = composer.get_autoload_generator().clone(); let generator = generator.borrow(); |