diff options
Diffstat (limited to 'crates/shirabe/src')
11 files changed, 35 insertions, 26 deletions
diff --git a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs index ca3286c..ef49239 100644 --- a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs @@ -48,6 +48,10 @@ impl OperationInterface for InstallOperation { fn as_install_operation(&self) -> Option<&InstallOperation> { Some(self) } + + fn get_package(&self) -> PackageInterfaceHandle { + self.package.clone() + } } impl std::fmt::Display for InstallOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs index ab07b6a..28bf511 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs @@ -44,6 +44,10 @@ impl OperationInterface for MarkAliasInstalledOperation { .get_full_pretty_version(true, crate::package::DisplayMode::SourceRefIfDev), ) } + + fn get_package(&self) -> crate::package::PackageInterfaceHandle { + self.package.clone().into() + } } impl std::fmt::Display for MarkAliasInstalledOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs index 1b107f0..3c0de33 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs @@ -44,6 +44,10 @@ impl OperationInterface for MarkAliasUninstalledOperation { .get_full_pretty_version(true, crate::package::DisplayMode::SourceRefIfDev), ) } + + fn get_package(&self) -> crate::package::PackageInterfaceHandle { + self.package.clone().into() + } } impl std::fmt::Display for MarkAliasUninstalledOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs index efb3610..d2dd665 100644 --- a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs @@ -47,6 +47,10 @@ impl OperationInterface for UninstallOperation { fn as_uninstall_operation(&self) -> Option<&UninstallOperation> { Some(self) } + + fn get_package(&self) -> PackageInterfaceHandle { + self.package.clone() + } } impl std::fmt::Display for UninstallOperation { diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs index 7686a3e..ef39513 100644 --- a/crates/shirabe/src/dependency_resolver/rule.rs +++ b/crates/shirabe/src/dependency_resolver/rule.rs @@ -23,6 +23,7 @@ use crate::dependency_resolver::RuleSet; use crate::package::AliasPackage; use crate::package::BasePackage; use crate::package::BasePackageHandle; +use crate::repository::RepositoryInterface; use crate::package::Link; use crate::package::PackageInterface; use crate::package::version::VersionParser; @@ -214,12 +215,11 @@ impl Rule { if PlatformRepository::is_platform_package(link.get_target()) { return false; } - // TODO(phase-c): request.get_locked_repository() exists, but its get_packages() - // returns Result while is_caused_by_lock returns bool; resolving needs the bool - // chain (also via Problem/SolverProblemsException, itself phase-c) to carry Result. - let locked_repo: Option<()> = todo!("request.get_locked_repository()"); - if let Some(_locked_repo) = locked_repo { - let packages: Vec<BasePackageHandle> = todo!("locked_repo.get_packages()"); + if let Some(locked_repo) = request.get_locked_repository() { + let packages = locked_repo + .borrow_mut() + .get_packages() + .expect("LockArrayRepository::get_packages() never fails"); for package in packages { let p = package.clone(); if p.get_name() == link.get_target() { @@ -255,12 +255,11 @@ impl Rule { if PlatformRepository::is_platform_package(package_name) { return false; } - // TODO(phase-c): request.get_locked_repository() exists, but its get_packages() - // returns Result while is_caused_by_lock returns bool; resolving needs the bool - // chain (also via Problem/SolverProblemsException, itself phase-c) to carry Result. - let locked_repo: Option<()> = todo!("request.get_locked_repository()"); - if let Some(_locked_repo) = locked_repo { - let packages: Vec<BasePackageHandle> = todo!("locked_repo.get_packages()"); + if let Some(locked_repo) = request.get_locked_repository() { + let packages = locked_repo + .borrow_mut() + .get_packages() + .expect("LockArrayRepository::get_packages() never fails"); for package in packages { let p = package.clone(); if p.get_name() == *package_name { diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs index c0e71ec..1cc899d 100644 --- a/crates/shirabe/src/package/alias_package.rs +++ b/crates/shirabe/src/package/alias_package.rs @@ -270,11 +270,8 @@ impl PackageInterface for AliasPackage { self.dev_requires.clone() } - fn get_type(&self) -> &str { - // Delegates to the shared `aliasOf` handle, whose getters yield owned - // `String`s; a borrow cannot escape the `RefCell`. Use the handle API - // (`AliasPackageHandle::get_alias_of().get_type()`) instead. - todo!("AliasPackage::get_type cannot return &str across the aliasOf handle") + fn get_type(&self) -> String { + self.alias_of.get_type() } fn get_target_dir(&self) -> Option<String> { diff --git a/crates/shirabe/src/package/complete_package.rs b/crates/shirabe/src/package/complete_package.rs index 56d50d5..d19b041 100644 --- a/crates/shirabe/src/package/complete_package.rs +++ b/crates/shirabe/src/package/complete_package.rs @@ -187,7 +187,7 @@ impl PackageInterface for CompletePackage { self.inner.is_dev() } - fn get_type(&self) -> &str { + fn get_type(&self) -> String { PackageInterface::get_type(&self.inner) } diff --git a/crates/shirabe/src/package/handle.rs b/crates/shirabe/src/package/handle.rs index 83a5d47..e75a1a0 100644 --- a/crates/shirabe/src/package/handle.rs +++ b/crates/shirabe/src/package/handle.rs @@ -201,7 +201,7 @@ macro_rules! delegate_package_interface_to_inner { fn is_dev(&self) -> bool { self.$field.is_dev() } - fn get_type(&self) -> &str { + fn get_type(&self) -> String { self.$field.get_type() } fn get_target_dir(&self) -> Option<String> { diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index e2f1f1a..a0497b2 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -611,11 +611,8 @@ impl PackageInterface for Package { fn is_dev(&self) -> bool { self.dev } - fn get_type(&self) -> &str { - self.r#type - .as_deref() - .filter(|s| !s.is_empty()) - .unwrap_or("library") + fn get_type(&self) -> String { + Package::get_type(self) } fn get_target_dir(&self) -> Option<String> { Package::get_target_dir(self) diff --git a/crates/shirabe/src/package/package_interface.rs b/crates/shirabe/src/package/package_interface.rs index 285a30b..621c73f 100644 --- a/crates/shirabe/src/package/package_interface.rs +++ b/crates/shirabe/src/package/package_interface.rs @@ -62,7 +62,7 @@ pub trait PackageInterface: std::fmt::Display + std::fmt::Debug { /// Returns the package type, e.g. library /// /// @return string The package type - fn get_type(&self) -> &str; + fn get_type(&self) -> String; /// Returns the package targetDir property /// diff --git a/crates/shirabe/src/package/root_package.rs b/crates/shirabe/src/package/root_package.rs index 9cdc6e2..355f1f6 100644 --- a/crates/shirabe/src/package/root_package.rs +++ b/crates/shirabe/src/package/root_package.rs @@ -266,7 +266,7 @@ impl PackageInterface for RootPackage { fn is_dev(&self) -> bool { self.inner.is_dev() } - fn get_type(&self) -> &str { + fn get_type(&self) -> String { self.inner.get_type() } fn get_target_dir(&self) -> Option<String> { |