aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/io/base_io.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-05-19 21:46:01 +0900
committernsfisis <nsfisis@gmail.com>2026-05-19 21:46:08 +0900
commit5e31fa33c3b5cf726a57a063b8e7a070869250fe (patch)
tree98522466966fa7df483cad174ab5fc03db39bc09 /crates/shirabe/src/io/base_io.rs
parentc839244d8d09f3036ebfee8eef7eb6b147e593ab (diff)
downloadphp-shirabe-5e31fa33c3b5cf726a57a063b8e7a070869250fe.tar.gz
php-shirabe-5e31fa33c3b5cf726a57a063b8e7a070869250fe.tar.zst
php-shirabe-5e31fa33c3b5cf726a57a063b8e7a070869250fe.zip
fix(compile): fix more random compile errors
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/io/base_io.rs')
-rw-r--r--crates/shirabe/src/io/base_io.rs50
1 files changed, 19 insertions, 31 deletions
diff --git a/crates/shirabe/src/io/base_io.rs b/crates/shirabe/src/io/base_io.rs
index d4e8f73..6e6e7d0 100644
--- a/crates/shirabe/src/io/base_io.rs
+++ b/crates/shirabe/src/io/base_io.rs
@@ -54,37 +54,29 @@ pub trait BaseIO: IOInterface {
self.authentications_mut().insert(repository_name, auth);
}
- fn write_raw(&self, messages: PhpMixed, newline: bool, verbosity: i64) {
- self.write(messages, newline, verbosity);
- }
-
- fn write_error_raw(&self, messages: PhpMixed, newline: bool, verbosity: i64) {
- self.write_error(messages, newline, verbosity);
- }
-
fn check_and_set_authentication(
&mut self,
repository_name: String,
username: String,
password: Option<String>,
) {
- if self.has_authentication(&repository_name) {
- let auth = self.get_authentication(&repository_name);
+ if BaseIO::has_authentication(self, &repository_name) {
+ let auth = BaseIO::get_authentication(self, &repository_name);
if auth.get("username").and_then(|v| v.as_deref()) == Some(username.as_str())
&& *auth.get("password").unwrap_or(&None) == password
{
return;
}
- self.write_error(
- PhpMixed::String(format!(
+ self.write_error3(
+ &format!(
"<warning>Warning: You should avoid overwriting already defined auth settings for {}.</warning>",
repository_name
- )),
+ ),
true,
io_interface::NORMAL,
);
}
- self.set_authentication(repository_name, username, password);
+ BaseIO::set_authentication(self, repository_name, username, password);
}
fn load_configuration(&mut self, config: &mut Config) -> anyhow::Result<()> {
@@ -358,14 +350,10 @@ pub trait BaseIO: IOInterface {
}
if !ssl_options.contains_key("local_cert") {
- self.write_error(
- PhpMixed::String(format!(
- "<warning>Warning: Client certificate configuration is missing key `local_cert` for {}.</warning>",
- domain
- )),
- true,
- io_interface::NORMAL,
- );
+ self.write_error3(&format!(
+ "<warning>Warning: Client certificate configuration is missing key `local_cert` for {}.</warning>",
+ domain
+ ), true, io_interface::NORMAL);
continue;
}
@@ -481,31 +469,31 @@ pub trait BaseIO: IOInterface {
]),
false,
) {
- self.write_error(
- PhpMixed::String(format!("<error>{}</error>", message_str)),
+ self.write_error3(
+ &format!("<error>{}</error>", message_str),
true,
io_interface::NORMAL,
);
} else if level_str == LogLevel::WARNING {
- self.write_error(
- PhpMixed::String(format!("<warning>{}</warning>", message_str)),
+ self.write_error3(
+ &format!("<warning>{}</warning>", message_str),
true,
io_interface::NORMAL,
);
} else if level_str == LogLevel::NOTICE {
- self.write_error(
- PhpMixed::String(format!("<info>{}</info>", message_str)),
+ self.write_error3(
+ &format!("<info>{}</info>", message_str),
true,
io_interface::VERBOSE,
);
} else if level_str == LogLevel::INFO {
- self.write_error(
- PhpMixed::String(format!("<info>{}</info>", message_str)),
+ self.write_error3(
+ &format!("<info>{}</info>", message_str),
true,
io_interface::VERY_VERBOSE,
);
} else {
- self.write_error(PhpMixed::String(message_str), true, io_interface::DEBUG);
+ self.write_error3(&message_str, true, io_interface::DEBUG);
}
}
}