diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-07-18 18:51:01 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-07-18 18:51:01 +0900 |
| commit | 134acc52c0f339dd8bf96d4ffc508cdebe66b7d2 (patch) | |
| tree | 8e49a78301adf0ae75412fa820c69d4a1e6cc880 | |
| parent | 8cf9f977d90d0a8e8bfcb868a7ebcd4e1309c517 (diff) | |
| download | php-shirabe-134acc52c0f339dd8bf96d4ffc508cdebe66b7d2.tar.gz php-shirabe-134acc52c0f339dd8bf96d4ffc508cdebe66b7d2.tar.zst php-shirabe-134acc52c0f339dd8bf96d4ffc508cdebe66b7d2.zip | |
chore: rustfmt
10 files changed, 138 insertions, 38 deletions
diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs index 9f203517..6ddf29b6 100644 --- a/crates/shirabe/src/downloader/archive_downloader.rs +++ b/crates/shirabe/src/downloader/archive_downloader.rs @@ -36,7 +36,9 @@ pub trait ArchiveDownloader { self.cleanup_executed() .borrow_mut() .shift_remove(&package.get_name()); - self.inner().prepare(r#type, package, path, prev_package).await + self.inner() + .prepare(r#type, package, path, prev_package) + .await } async fn cleanup( @@ -49,7 +51,9 @@ pub trait ArchiveDownloader { self.cleanup_executed() .borrow_mut() .insert(package.get_name(), true); - self.inner().cleanup(r#type, package, path, prev_package).await + self.inner() + .cleanup(r#type, package, path, prev_package) + .await } /// @inheritDoc @@ -108,7 +112,8 @@ pub trait ArchiveDownloader { } }; - self.inner().add_cleanup_path(package.clone(), &temporary_dir); + self.inner() + .add_cleanup_path(package.clone(), &temporary_dir); // avoid cleaning up $path if installing in "." for eg create-project as we can not // delete the directory we are currently in on windows if !is_dir(path) || realpath(path) != Some(Platform::get_cwd(false).unwrap_or_default()) { @@ -189,7 +194,8 @@ pub trait ArchiveDownloader { Filesystem::remove_directory_async_via(&self.inner().filesystem, &temporary_dir) .await?; - self.inner().remove_cleanup_path(package.clone(), &temporary_dir); + self.inner() + .remove_cleanup_path(package.clone(), &temporary_dir); self.inner().remove_cleanup_path(package, path); Ok(None) diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs index 9742fd70..cbf008c4 100644 --- a/crates/shirabe/src/downloader/file_downloader.rs +++ b/crates/shirabe/src/downloader/file_downloader.rs @@ -127,7 +127,9 @@ impl FileDownloader { && cache.borrow().gc_is_necessary() { // PHP: writeError('Running cache garbage collection', true, io_interface::VERY_VERBOSE) - this.io.borrow().write_error("Running cache garbage collection"); + this.io + .borrow() + .write_error("Running cache garbage collection"); let ttl = this .config .borrow_mut() diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs index b799de5a..eac5a859 100644 --- a/crates/shirabe/src/downloader/path_downloader.rs +++ b/crates/shirabe/src/downloader/path_downloader.rs @@ -427,7 +427,10 @@ impl DownloaderInterface for PathDownloader { Err(_e) => { if allowed_strategies.contains(&Self::STRATEGY_MIRROR) { if output { - self.inner.io.borrow().write_error3("", true, io_interface::NORMAL); + self.inner + .io + .borrow() + .write_error3("", true, io_interface::NORMAL); self.inner.io.borrow().write_error3( " <error>Symlink failed, fallback to use mirroring!</error>", true, @@ -475,7 +478,10 @@ impl DownloaderInterface for PathDownloader { } if output { - self.inner.io.borrow().write_error3("", true, io_interface::NORMAL); + self.inner + .io + .borrow() + .write_error3("", true, io_interface::NORMAL); } Ok(None) diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index c149505b..9fa68c53 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -285,7 +285,11 @@ impl ZipDownloader { file: &str, path: &str, ) -> anyhow::Result<Option<PhpMixed>> { - let mut zip_archive = self.zip_archive_object.borrow_mut().take().unwrap_or_default(); + let mut zip_archive = self + .zip_archive_object + .borrow_mut() + .take() + .unwrap_or_default(); let result: anyhow::Result<Option<PhpMixed>> = (|| { let retval = if !file_exists(file) || filesize(file).is_none_or(|s| s == 0) { diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs index 906dac53..6c46754c 100644 --- a/crates/shirabe/src/installer/installation_manager.rs +++ b/crates/shirabe/src/installer/installation_manager.rs @@ -500,7 +500,10 @@ impl InstallationManager { let package = package.clone(); let initial_package = initial_package.clone(); promises.push(Box::pin(async move { - installer.download(package, initial_package).await.map(|_| ()) + installer + .download(package, initial_package) + .await + .map(|_| ()) })); } } diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index 349f08e1..185616ac 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -576,8 +576,7 @@ impl VersionGuesser { }, &scm_cmdline, ); - let process_future = - self.process.borrow().execute_async(&cmd_line, Some(path)); + let process_future = self.process.borrow().execute_async(&cmd_line, Some(path)); let mut process = sync_executor::block_on(process_future)?; if !process.is_successful() { continue; diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index f3cb2e63..70bf69f7 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -905,7 +905,9 @@ impl Filesystem { /// Hands out the executor handle itself so async callers can hold only a shared borrow /// across their awaits (a RefMut held across an await panics once calls overlap). - pub(crate) fn get_process_handle(&mut self) -> std::rc::Rc<std::cell::RefCell<ProcessExecutor>> { + pub(crate) fn get_process_handle( + &mut self, + ) -> std::rc::Rc<std::cell::RefCell<ProcessExecutor>> { if self.process_executor.is_none() { self.process_executor = Some(std::rc::Rc::new(std::cell::RefCell::new( ProcessExecutor::new(None), diff --git a/crates/shirabe/tests/installer/installation_manager_test.rs b/crates/shirabe/tests/installer/installation_manager_test.rs index a39eaddf..26b8d7fa 100644 --- a/crates/shirabe/tests/installer/installation_manager_test.rs +++ b/crates/shirabe/tests/installer/installation_manager_test.rs @@ -326,7 +326,10 @@ fn test_install() { let operation = InstallOperation::new(package.clone()); let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.install(&std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), &operation)); + run(manager.install( + &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), + &operation, + )); } #[test] @@ -358,7 +361,10 @@ fn test_update_with_equal_types() { let operation = UpdateOperation::new(initial.clone(), target.clone()); let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.update(&std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), &operation)); + run(manager.update( + &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), + &operation, + )); } #[test] @@ -400,7 +406,10 @@ fn test_update_with_not_equal_types() { let operation = UpdateOperation::new(initial.clone(), target.clone()); let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.update(&std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), &operation)); + run(manager.update( + &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), + &operation, + )); } #[test] @@ -428,7 +437,10 @@ fn test_uninstall() { let operation = UninstallOperation::new(package.clone()); let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.uninstall(&std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), &operation)); + run(manager.uninstall( + &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), + &operation, + )); } #[test] diff --git a/crates/shirabe/tests/installer/library_installer_test.rs b/crates/shirabe/tests/installer/library_installer_test.rs index c233ebcd..f9dceb56 100644 --- a/crates/shirabe/tests/installer/library_installer_test.rs +++ b/crates/shirabe/tests/installer/library_installer_test.rs @@ -196,8 +196,7 @@ fn test_installer_creation_should_not_create_bin_directory() { #[test] fn test_is_installed() { let mut setup = set_up(); - let library = - LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); + let library = LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); let package = get_package("test/pkg", "1.0.0"); let mut repository = InstalledArrayRepository::new().unwrap(); @@ -237,12 +236,17 @@ fn test_install() { .returning(|_, _| Ok(None)); set_download_manager(&setup, dm); - let library = - LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); + let library = LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); let mut repository = InstalledArrayRepository::new().unwrap(); - run(library.install(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), package.clone())).unwrap(); + run(library.install( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, + ), + package.clone(), + )) + .unwrap(); // PHP asserts repository->addPackage was called once with $package. assert!(repository.has_package(package)); @@ -296,10 +300,16 @@ fn test_update() { repository.add_package(initial.clone()).unwrap(); // The default Filesystem is fine; the LibraryInstaller's own filesystem performs the rename. - let library = - LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); + let library = LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); - run(library.update(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), initial.clone(), target.clone())).unwrap(); + run(library.update( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, + ), + initial.clone(), + target.clone(), + )) + .unwrap(); assert!( std::path::Path::new(&new_target_dir).exists(), @@ -320,7 +330,16 @@ fn test_update() { ); // Updating again, with the initial package no longer installed, fails. - assert!(run(library.update(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), initial, target)).is_err()); + assert!( + run(library.update( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface + ), + initial, + target + )) + .is_err() + ); tear_down(&mut setup); } @@ -344,8 +363,7 @@ fn test_uninstall() { .returning(|_, _| Ok(None)); set_download_manager(&setup, dm); - let library = - LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); + let library = LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); // PHP mocks hasPackage to return (true, false) over two calls; a real repository // seeded with the package reproduces this naturally: present, then absent after @@ -353,12 +371,26 @@ fn test_uninstall() { let mut repository = InstalledArrayRepository::new().unwrap(); repository.add_package(package.clone()).unwrap(); - run(library.uninstall(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), package.clone())).unwrap(); + run(library.uninstall( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, + ), + package.clone(), + )) + .unwrap(); assert!(!repository.has_package(package.clone())); // Uninstalling again, with the package no longer installed, fails. - assert!(run(library.uninstall(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), package)).is_err()); + assert!( + run(library.uninstall( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface + ), + package + )) + .is_err() + ); tear_down(&mut setup); } @@ -366,8 +398,7 @@ fn test_uninstall() { #[test] fn test_get_install_path_without_target_dir() { let mut setup = set_up(); - let library = - LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); + let library = LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); let package = get_package("Vendor/Pkg", "1.0.0"); assert_eq!( @@ -381,8 +412,7 @@ fn test_get_install_path_without_target_dir() { #[test] fn test_get_install_path_with_target_dir() { let mut setup = set_up(); - let library = - LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); + let library = LibraryInstaller::new(setup.io.clone(), setup.composer.clone(), None, None, None); let package = get_package("Foo/Bar", "1.0.0"); package.__set_target_dir(Some("Some/Namespace".to_string())); diff --git a/crates/shirabe/tests/installer/metapackage_installer_test.rs b/crates/shirabe/tests/installer/metapackage_installer_test.rs index a3806ec8..86013871 100644 --- a/crates/shirabe/tests/installer/metapackage_installer_test.rs +++ b/crates/shirabe/tests/installer/metapackage_installer_test.rs @@ -22,7 +22,13 @@ fn test_install() { let installer = installer(); let mut repository = InstalledArrayRepository::new_with_packages(vec![]).unwrap(); - run(installer.install(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), package.clone())).unwrap(); + run(installer.install( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, + ), + package.clone(), + )) + .unwrap(); assert!(repository.has_package(package)); } @@ -35,13 +41,29 @@ fn test_update() { let mut repository = InstalledArrayRepository::new_with_packages(vec![initial.clone()]).unwrap(); - run(installer.update(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), initial.clone(), target.clone())).unwrap(); + run(installer.update( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, + ), + initial.clone(), + target.clone(), + )) + .unwrap(); assert!(!repository.has_package(initial.clone())); assert!(repository.has_package(target.clone())); // Updating again, with the initial package no longer installed, fails. - assert!(run(installer.update(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), initial, target)).is_err()); + assert!( + run(installer.update( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface + ), + initial, + target + )) + .is_err() + ); } #[test] @@ -51,10 +73,24 @@ fn test_uninstall() { let mut repository = InstalledArrayRepository::new_with_packages(vec![package.clone()]).unwrap(); - run(installer.uninstall(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), package.clone())).unwrap(); + run(installer.uninstall( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, + ), + package.clone(), + )) + .unwrap(); assert!(!repository.has_package(package.clone())); // Uninstalling again, with the package no longer installed, fails. - assert!(run(installer.uninstall(&std::cell::RefCell::new(&mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface), package)).is_err()); + assert!( + run(installer.uninstall( + &std::cell::RefCell::new( + &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface + ), + package + )) + .is_err() + ); } |
