aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/loader/validating_array_loader.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-12 03:19:34 +0900
committernsfisis <nsfisis@gmail.com>2026-06-12 03:19:34 +0900
commitefe5bdb1987411a473d4af15451a376d20928245 (patch)
tree54d3c9e7ab92cfc7d7ec3d90ca3f29e828d929c4 /crates/shirabe/src/package/loader/validating_array_loader.rs
parent981cae63d9777b877aa9f96907c7995ec020fbf9 (diff)
downloadphp-shirabe-efe5bdb1987411a473d4af15451a376d20928245.tar.gz
php-shirabe-efe5bdb1987411a473d4af15451a376d20928245.tar.zst
php-shirabe-efe5bdb1987411a473d4af15451a376d20928245.zip
refactor(php-shim): replace literal sprintf calls with format!
Convert every sprintf() call with a compile-time literal format string to format!, implementing Display for PhpMixed (delegating to php_to_string) so PhpMixed values render with PHP string semantics through {}. Also merge the format!-wrapped and conditional-literal dynamic sites into single format! calls. Genuinely runtime format strings (table styles, configurable error messages, command synopsis, progress-bar modifiers, regex-built messages) still go through sprintf. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package/loader/validating_array_loader.rs')
-rw-r--r--crates/shirabe/src/package/loader/validating_array_loader.rs34
1 files changed, 15 insertions, 19 deletions
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index e6db19e..4a1e2c2 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -195,9 +195,9 @@ impl ValidatingArrayLoader {
for index in &license_keys {
let license = licenses[index].clone();
if !is_string(&*license) {
- self.warnings.push(sprintf(
- "License %s should be a string.",
- &[PhpMixed::String(json_encode(&*license).unwrap_or_default())],
+ self.warnings.push(format!(
+ "License {} should be a string.",
+ PhpMixed::String(json_encode(&*license).unwrap_or_default()),
));
licenses.shift_remove(index);
}
@@ -218,23 +218,21 @@ impl ValidatingArrayLoader {
if license_validator
.validate(&trim(&license_to_validate, Some(" \t\n\r\0\u{0B}")))
{
- self.warnings.push(sprintf(
- "License %s must not contain extra spaces, make sure to trim it.",
- &[PhpMixed::String(
+ self.warnings.push(format!(
+ "License {} must not contain extra spaces, make sure to trim it.",
+ PhpMixed::String(
json_encode(&PhpMixed::String(license_str.clone()))
.unwrap_or_default(),
- )],
+ ),
));
} else {
- self.warnings.push(sprintf(
- &format!(
- "License %s is not a valid SPDX license identifier, see https://spdx.org/licenses/ if you use an open license.{}If the software is closed-source, you may use \"proprietary\" as license.",
- PHP_EOL
- ),
- &[PhpMixed::String(
+ self.warnings.push(format!(
+ "License {} is not a valid SPDX license identifier, see https://spdx.org/licenses/ if you use an open license.{}If the software is closed-source, you may use \"proprietary\" as license.",
+ PhpMixed::String(
json_encode(&PhpMixed::String(license_str.clone()))
.unwrap_or_default(),
- )],
+ ),
+ PHP_EOL
));
}
}
@@ -251,11 +249,9 @@ impl ValidatingArrayLoader {
Box::new(PhpMixed::Array(reindexed_map)),
);
} else {
- self.warnings.push(sprintf(
- "License must be a string or array of strings, got %s.",
- &[PhpMixed::String(
- json_encode(&*license_val).unwrap_or_default(),
- )],
+ self.warnings.push(format!(
+ "License must be a string or array of strings, got {}.",
+ PhpMixed::String(json_encode(&*license_val).unwrap_or_default(),),
));
self.config.shift_remove("license");
}