From ac59538140a93d9a023da2115148bc9779223978 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 17 May 2026 14:04:20 +0900 Subject: fix(compile): fix trait signature errors --- crates/shirabe/src/downloader/downloader_interface.rs | 3 +++ crates/shirabe/src/downloader/file_downloader.rs | 18 +++++++++--------- crates/shirabe/src/package/root_alias_package.rs | 16 ++++++++-------- crates/shirabe/src/package/root_package.rs | 2 +- crates/shirabe/src/package/root_package_interface.rs | 8 ++++---- 5 files changed, 25 insertions(+), 22 deletions(-) (limited to 'crates/shirabe') diff --git a/crates/shirabe/src/downloader/downloader_interface.rs b/crates/shirabe/src/downloader/downloader_interface.rs index 423df69..6662799 100644 --- a/crates/shirabe/src/downloader/downloader_interface.rs +++ b/crates/shirabe/src/downloader/downloader_interface.rs @@ -12,6 +12,7 @@ pub trait DownloaderInterface { package: &dyn PackageInterface, path: &str, prev_package: Option<&dyn PackageInterface>, + output: bool, ) -> anyhow::Result>; fn prepare( @@ -26,6 +27,7 @@ pub trait DownloaderInterface { &self, package: &dyn PackageInterface, path: &str, + output: bool, ) -> anyhow::Result>; fn update( @@ -39,6 +41,7 @@ pub trait DownloaderInterface { &self, package: &dyn PackageInterface, path: &str, + output: bool, ) -> anyhow::Result>; fn cleanup( diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs index cee4a3f..c9c9392 100644 --- a/crates/shirabe/src/downloader/file_downloader.rs +++ b/crates/shirabe/src/downloader/file_downloader.rs @@ -116,13 +116,13 @@ impl FileDownloader { impl DownloaderInterface for FileDownloader { /// @inheritDoc - fn get_installation_source(&self) -> &str { - "dist" + fn get_installation_source(&self) -> String { + "dist".to_owned() } /// @inheritDoc fn download( - &mut self, + &self, package: &dyn PackageInterface, path: &str, _prev_package: Option<&dyn PackageInterface>, @@ -184,7 +184,7 @@ impl DownloaderInterface for FileDownloader { /// @inheritDoc fn prepare( - &mut self, + &self, _type: &str, _package: &dyn PackageInterface, _path: &str, @@ -195,7 +195,7 @@ impl DownloaderInterface for FileDownloader { /// @inheritDoc fn cleanup( - &mut self, + &self, _type: &str, package: &dyn PackageInterface, path: &str, @@ -249,7 +249,7 @@ impl DownloaderInterface for FileDownloader { /// @inheritDoc fn install( - &mut self, + &self, package: &dyn PackageInterface, path: &str, output: bool, @@ -308,7 +308,7 @@ impl DownloaderInterface for FileDownloader { /// @inheritDoc fn update( - &mut self, + &self, initial: &dyn PackageInterface, target: &dyn PackageInterface, path: &str, @@ -327,7 +327,7 @@ impl DownloaderInterface for FileDownloader { /// @inheritDoc fn remove( - &mut self, + &self, package: &dyn PackageInterface, path: &str, output: bool, @@ -348,7 +348,7 @@ impl ChangeReportInterface for FileDownloader { /// @inheritDoc /// @throws \RuntimeException fn get_local_changes( - &mut self, + &self, package: &dyn PackageInterface, path: &str, ) -> Result> { diff --git a/crates/shirabe/src/package/root_alias_package.rs b/crates/shirabe/src/package/root_alias_package.rs index 63fcc82..447f46a 100644 --- a/crates/shirabe/src/package/root_alias_package.rs +++ b/crates/shirabe/src/package/root_alias_package.rs @@ -28,28 +28,28 @@ impl RootAliasPackage { } impl RootPackageInterface for RootAliasPackage { - fn get_aliases(&self) -> Vec> { - self.alias_of.get_aliases().clone() + fn get_aliases(&self) -> &[IndexMap] { + self.alias_of.get_aliases() } fn get_minimum_stability(&self) -> &str { self.alias_of.get_minimum_stability() } - fn get_stability_flags(&self) -> IndexMap { - self.alias_of.get_stability_flags().clone() + fn get_stability_flags(&self) -> &IndexMap { + self.alias_of.get_stability_flags() } - fn get_references(&self) -> IndexMap { - self.alias_of.get_references().clone() + fn get_references(&self) -> &IndexMap { + self.alias_of.get_references() } fn get_prefer_stable(&self) -> bool { self.alias_of.get_prefer_stable() } - fn get_config(&self) -> IndexMap { - self.alias_of.get_config().clone() + fn get_config(&self) -> &IndexMap { + self.alias_of.get_config() } fn set_requires(&mut self, requires: Vec) { diff --git a/crates/shirabe/src/package/root_package.rs b/crates/shirabe/src/package/root_package.rs index 55a6805..846cd13 100644 --- a/crates/shirabe/src/package/root_package.rs +++ b/crates/shirabe/src/package/root_package.rs @@ -65,7 +65,7 @@ impl RootPackageInterface for RootPackage { self.aliases = aliases; } - fn get_aliases(&self) -> &Vec> { + fn get_aliases(&self) -> &[IndexMap] { &self.aliases } } diff --git a/crates/shirabe/src/package/root_package_interface.rs b/crates/shirabe/src/package/root_package_interface.rs index 7bcc925..a8634af 100644 --- a/crates/shirabe/src/package/root_package_interface.rs +++ b/crates/shirabe/src/package/root_package_interface.rs @@ -7,17 +7,17 @@ use crate::package::complete_package_interface::CompletePackageInterface; use crate::package::link::Link; pub trait RootPackageInterface: CompletePackageInterface { - fn get_aliases(&self) -> Vec>; + fn get_aliases(&self) -> &[IndexMap]; fn get_minimum_stability(&self) -> &str; - fn get_stability_flags(&self) -> IndexMap; + fn get_stability_flags(&self) -> &IndexMap; - fn get_references(&self) -> IndexMap; + fn get_references(&self) -> &IndexMap; fn get_prefer_stable(&self) -> bool; - fn get_config(&self) -> IndexMap; + fn get_config(&self) -> &IndexMap; fn set_requires(&mut self, requires: Vec); -- cgit v1.3.1