From 3e21569688cf0c8a1918c73ff96cb1b3aeffe0b3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 17 May 2026 14:33:13 +0900 Subject: fix(compile): extract constants from traits to make them dyn-compatible --- crates/shirabe/src/repository/vcs/forgejo_driver.rs | 5 +++-- crates/shirabe/src/repository/vcs/fossil_driver.rs | 3 ++- crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs | 5 +++-- crates/shirabe/src/repository/vcs/git_driver.rs | 3 ++- crates/shirabe/src/repository/vcs/github_driver.rs | 11 ++++++----- crates/shirabe/src/repository/vcs/gitlab_driver.rs | 9 +++++---- crates/shirabe/src/repository/vcs/hg_driver.rs | 3 ++- 7 files changed, 23 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/src/repository/vcs') diff --git a/crates/shirabe/src/repository/vcs/forgejo_driver.rs b/crates/shirabe/src/repository/vcs/forgejo_driver.rs index c03f217..2efbfb7 100644 --- a/crates/shirabe/src/repository/vcs/forgejo_driver.rs +++ b/crates/shirabe/src/repository/vcs/forgejo_driver.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Repository/Vcs/ForgejoDriver.php +use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; @@ -489,7 +490,7 @@ impl ForgejoDriver { url )), true, - IOInterface::VERBOSE, + io_interface::VERBOSE, ); return false; @@ -655,7 +656,7 @@ impl ForgejoDriver { ssh_url )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); Err(e) } diff --git a/crates/shirabe/src/repository/vcs/fossil_driver.rs b/crates/shirabe/src/repository/vcs/fossil_driver.rs index f1e6a89..cd3ae3a 100644 --- a/crates/shirabe/src/repository/vcs/fossil_driver.rs +++ b/crates/shirabe/src/repository/vcs/fossil_driver.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Repository/Vcs/FossilDriver.php +use crate::io::io_interface; use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::preg::Preg; @@ -133,7 +134,7 @@ impl FossilDriver { self.inner.process.get_error_output() )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); } } else { diff --git a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs index 0e16ced..fb667b7 100644 --- a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Repository/Vcs/GitBitbucketDriver.php +use crate::io::io_interface; use anyhow::Result; use chrono::{DateTime, Utc}; use indexmap::IndexMap; @@ -843,8 +844,8 @@ impl GitBitbucketDriver { url ), ); - // PHP: writeError(..., true, IOInterface::VERBOSE) - // TODO(phase-b): IOInterface::VERBOSE verbosity argument + // PHP: writeError(..., true, io_interface::VERBOSE) + // TODO(phase-b): io_interface::VERBOSE verbosity argument return false; } diff --git a/crates/shirabe/src/repository/vcs/git_driver.rs b/crates/shirabe/src/repository/vcs/git_driver.rs index 48aa4c1..40ad179 100644 --- a/crates/shirabe/src/repository/vcs/git_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_driver.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Repository/Vcs/GitDriver.php +use crate::io::io_interface; use chrono::TimeZone; use chrono::{DateTime, Utc}; use indexmap::IndexMap; @@ -117,7 +118,7 @@ impl GitDriver { self.inner.url )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); } diff --git a/crates/shirabe/src/repository/vcs/github_driver.rs b/crates/shirabe/src/repository/vcs/github_driver.rs index 233e3ea..7bf15bf 100644 --- a/crates/shirabe/src/repository/vcs/github_driver.rs +++ b/crates/shirabe/src/repository/vcs/github_driver.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Repository/Vcs/GitHubDriver.php +use crate::io::io_interface; use anyhow::Result; use chrono::{DateTime, Utc}; use indexmap::IndexMap; @@ -628,7 +629,7 @@ impl GitHubDriver { item_url )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); keys_to_remove.push(key_idx); } @@ -901,7 +902,7 @@ impl GitHubDriver { url )), true, - IOInterface::VERBOSE, + io_interface::VERBOSE, ); return false; @@ -1062,7 +1063,7 @@ impl GitHubDriver { self.inner.url )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); return Err(e); } @@ -1091,7 +1092,7 @@ impl GitHubDriver { ], )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); } @@ -1211,7 +1212,7 @@ impl GitHubDriver { self.generate_ssh_url() )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); Err(setup_err) } diff --git a/crates/shirabe/src/repository/vcs/gitlab_driver.rs b/crates/shirabe/src/repository/vcs/gitlab_driver.rs index 583f221..dea1bf6 100644 --- a/crates/shirabe/src/repository/vcs/gitlab_driver.rs +++ b/crates/shirabe/src/repository/vcs/gitlab_driver.rs @@ -1,5 +1,6 @@ //! ref: composer/src/Composer/Repository/Vcs/GitLabDriver.php +use crate::io::io_interface; use anyhow::Result; use chrono::{DateTime, Utc}; use indexmap::IndexMap; @@ -684,7 +685,7 @@ impl GitLabDriver { url )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); Err(e) } @@ -785,7 +786,7 @@ impl GitLabDriver { .to_string(), ), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); self.attempt_clone_fallback() @@ -887,7 +888,7 @@ impl GitLabDriver { self.namespace, self.repository, e.message )), true, - IOInterface::NORMAL, + io_interface::NORMAL, ); git_lab_util.authorize_oauth_interactively( &self.scheme, @@ -969,7 +970,7 @@ impl GitLabDriver { url )), true, - IOInterface::VERBOSE, + io_interface::VERBOSE, ); return false; diff --git a/crates/shirabe/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs index a8fc70a..3f27d7a 100644 --- a/crates/shirabe/src/repository/vcs/hg_driver.rs +++ b/crates/shirabe/src/repository/vcs/hg_driver.rs @@ -2,6 +2,7 @@ use crate::cache::Cache; use crate::config::Config; +use crate::io::io_interface; use crate::io::io_interface::IOInterface; use crate::repository::vcs::vcs_driver::VcsDriverBase; use crate::util::filesystem::Filesystem; @@ -79,7 +80,7 @@ impl HgDriver { self.inner.io.write_error( format!("Failed to update {}, package information from this repository may be outdated ({})", self.inner.url, self.inner.process.get_error_output()).into(), true, - crate::io::io_interface::IOInterface::NORMAL, + crate::io::io_interface::io_interface::NORMAL, ); } } else { -- cgit v1.3.1