chore: unwrap meaningless PhpMixed::String()

3 files changed, 8 insertions, 13 deletions

diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs
index 0411645..844b3ef 100644
--- a/crates/shirabe/src/package/loader/array_loader.rs
+++ b/crates/shirabe/src/package/loader/array_loader.rs
@@ -385,14 +385,13 @@ impl ArrayLoader {
                 return Err(UnexpectedValueException {
                     message: format!(
                         "Package {}'s source key should be specified as {{\"type\": ..., \"url\": ..., \"reference\": ...}},\n{} given.",
-                        PhpMixed::String(
+
                             config
                                 .get("name")
                                 .and_then(|v| v.as_string())
                                 .unwrap_or("")
                                 .to_string(),
-                        ),
-                        PhpMixed::String(json_encode(&source).unwrap_or_default()),
+                        json_encode(&source).unwrap_or_default(),
                     ),
                     code: 0,
                 }
@@ -428,14 +427,13 @@ impl ArrayLoader {
                 return Err(UnexpectedValueException {
                     message: format!(
                         "Package {}'s dist key should be specified as {{\"type\": ..., \"url\": ..., \"reference\": ..., \"shasum\": ...}},\n{} given.",
-                        PhpMixed::String(
+
                             config
                                 .get("name")
                                 .and_then(|v| v.as_string())
                                 .unwrap_or("")
                                 .to_string(),
-                        ),
-                        PhpMixed::String(json_encode(&dist).unwrap_or_default()),
+                        json_encode(&dist).unwrap_or_default(),
                     ),
                     code: 0,
                 }
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 50374d2..16b905e 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -266,7 +266,7 @@ impl RootPackageLoader {
         for (req_name, req_version) in requires {
             let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
             if Preg::is_match3(
-                r"(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *,)",
+                r"(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *)",
                 req_version,
                 Some(&mut m),
             ) {
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index 8081664..342e1cb 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -196,7 +196,7 @@ impl ValidatingArrayLoader {
                     if !is_string(&license) {
                         self.warnings.push(format!(
                             "License {} should be a string.",
-                            PhpMixed::String(json_encode(&license).unwrap_or_default()),
+                            json_encode(&license).unwrap_or_default(),
                         ));
                         licenses.shift_remove(index);
                     }
@@ -219,18 +219,15 @@ impl ValidatingArrayLoader {
                             {
                                 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(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
                                 ));
                             }
@@ -248,7 +245,7 @@ impl ValidatingArrayLoader {
             } else {
                 self.warnings.push(format!(
                     "License must be a string or array of strings, got {}.",
-                    PhpMixed::String(json_encode(&license_val).unwrap_or_default(),),
+                    json_encode(&license_val).unwrap_or_default(),
                 ));
                 self.config.shift_remove("license");
             }