diff options
Diffstat (limited to 'crates/shirabe/src/installer')
| -rw-r--r-- | crates/shirabe/src/installer/binary_installer.rs | 9 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/installation_manager.rs | 5 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/metapackage_installer.rs | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs index 0e5b3d9..243dde0 100644 --- a/crates/shirabe/src/installer/binary_installer.rs +++ b/crates/shirabe/src/installer/binary_installer.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Installer/BinaryInstaller.php +use crate::io::io_interface; use shirabe_external_packages::composer::pcre::preg::Preg; use shirabe_php_shim::{ PhpMixed, basename, basename_with_suffix, chmod, dirname, fclose, fgets, file_exists, @@ -65,7 +66,7 @@ impl BinaryInstaller { package.get_name(), )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); continue; } @@ -77,7 +78,7 @@ impl BinaryInstaller { package.get_name(), )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); continue; } @@ -100,7 +101,7 @@ impl BinaryInstaller { package.get_name(), )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); } continue; @@ -200,7 +201,7 @@ impl BinaryInstaller { package.get_name(), )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); } } diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs index 3362d86..798ea00 100644 --- a/crates/shirabe/src/installer/installation_manager.rs +++ b/crates/shirabe/src/installer/installation_manager.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Installer/InstallationManager.php +use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::react::promise; @@ -414,7 +415,7 @@ impl InstallationManager { self.io.write_error( PhpMixed::String(format!(" - {}", operation.show(false))), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); } // PHP: $this->{$opType}($repo, $operation); @@ -532,7 +533,7 @@ impl InstallationManager { // ProgressBar in non-decorated output does not output a final line-break and clear() does nothing if !self.io.is_decorated() { self.io - .write_error(PhpMixed::String(String::new()), true, IOInterface::NORMAL); + .write_error(PhpMixed::String(String::new()), true, io_interface::NORMAL); } } } diff --git a/crates/shirabe/src/installer/metapackage_installer.rs b/crates/shirabe/src/installer/metapackage_installer.rs index 0a5f872..3a47f70 100644 --- a/crates/shirabe/src/installer/metapackage_installer.rs +++ b/crates/shirabe/src/installer/metapackage_installer.rs @@ -4,6 +4,7 @@ use crate::dependency_resolver::operation::install_operation::InstallOperation; use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; use crate::dependency_resolver::operation::update_operation::UpdateOperation; use crate::installer::installer_interface::InstallerInterface; +use crate::io::io_interface; use crate::io::io_interface::IOInterface; use crate::package::package_interface::PackageInterface; use crate::repository::installed_repository_interface::InstalledRepositoryInterface; @@ -75,7 +76,7 @@ impl InstallerInterface for MetapackageInstaller { self.io.write_error( &format!(" - {}", InstallOperation::format(package, false)), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); repo.add_package(package.clone_box()); @@ -102,7 +103,7 @@ impl InstallerInterface for MetapackageInstaller { self.io.write_error( &format!(" - {}", UpdateOperation::format(initial, target, false)), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); repo.remove_package(initial); @@ -129,7 +130,7 @@ impl InstallerInterface for MetapackageInstaller { self.io.write_error( &format!(" - {}", UninstallOperation::format(package, false)), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); repo.remove_package(package); |