aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-05-01 20:59:06 +0900
committernsfisis <nsfisis@gmail.com>2026-05-01 21:00:25 +0900
commit41655c14ad33f9eed6efcc4490a604a0e2defa4b (patch)
treec33d7f4c849894ab6893e5a49aa1ccd17c084b4c /crates
parent6d36c654b094dbef823850e9a90047d8bafc1adc (diff)
downloadphp-mozart-41655c14ad33f9eed6efcc4490a604a0e2defa4b.tar.gz
php-mozart-41655c14ad33f9eed6efcc4490a604a0e2defa4b.tar.zst
php-mozart-41655c14ad33f9eed6efcc4490a604a0e2defa4b.zip
refactor: fix clippy warnings
Replace if-let/else-return with `?`, swap `as_ref().map(|k| k.as_slice())` for `as_deref()`, and switch test fixtures from `vec\![]` to array literals where ownership is unneeded. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates')
-rw-r--r--crates/mozart-registry/src/downloader.rs8
-rw-r--r--crates/mozart-registry/src/lockfile.rs4
-rw-r--r--crates/mozart/src/commands/check_platform_reqs.rs2
-rw-r--r--crates/mozart/src/commands/install.rs12
-rw-r--r--crates/mozart/src/commands/licenses.rs4
-rw-r--r--crates/mozart/src/commands/reinstall.rs6
-rw-r--r--crates/mozart/src/commands/search.rs2
-rw-r--r--crates/mozart/src/commands/suggests.rs8
8 files changed, 21 insertions, 25 deletions
diff --git a/crates/mozart-registry/src/downloader.rs b/crates/mozart-registry/src/downloader.rs
index 5431360..8c1f0b0 100644
--- a/crates/mozart-registry/src/downloader.rs
+++ b/crates/mozart-registry/src/downloader.rs
@@ -170,12 +170,8 @@ fn find_top_level_dir(entries: &[String]) -> Option<String> {
let mut prefixes: HashSet<String> = HashSet::new();
for entry in entries {
- if let Some(slash_pos) = entry.find('/') {
- prefixes.insert(entry[..slash_pos + 1].to_string());
- } else {
- // Entry at root level — no common prefix to strip
- return None;
- }
+ let slash_pos = entry.find('/')?;
+ prefixes.insert(entry[..slash_pos + 1].to_string());
}
if prefixes.len() == 1 {
diff --git a/crates/mozart-registry/src/lockfile.rs b/crates/mozart-registry/src/lockfile.rs
index 64333e6..a9ecf36 100644
--- a/crates/mozart-registry/src/lockfile.rs
+++ b/crates/mozart-registry/src/lockfile.rs
@@ -661,7 +661,7 @@ mod tests {
Some(vec!["MIT".to_string()].as_slice())
);
assert_eq!(
- locked.keywords.as_ref().map(|k| k.as_slice()),
+ locked.keywords.as_deref(),
Some(["example".to_string(), "test".to_string()].as_slice())
);
assert_eq!(locked.package_type.as_deref(), Some("library"));
@@ -954,7 +954,7 @@ mod tests {
// Verify that packages are sorted alphabetically when assembled in generate_lock_file
// We test this by constructing two LockedPackages and sorting them the same way
- let mut packages = vec![
+ let mut packages = [
LockedPackage {
name: "vendor/zebra".to_string(),
version: "1.0.0".to_string(),
diff --git a/crates/mozart/src/commands/check_platform_reqs.rs b/crates/mozart/src/commands/check_platform_reqs.rs
index d3ecacd..e9954f4 100644
--- a/crates/mozart/src/commands/check_platform_reqs.rs
+++ b/crates/mozart/src/commands/check_platform_reqs.rs
@@ -807,7 +807,7 @@ mod tests {
#[test]
fn test_output_json_format() {
- let results = vec![
+ let results = [
CheckResult {
name: "php".to_string(),
version: "8.2.1".to_string(),
diff --git a/crates/mozart/src/commands/install.rs b/crates/mozart/src/commands/install.rs
index 477253c..b245182 100644
--- a/crates/mozart/src/commands/install.rs
+++ b/crates/mozart/src/commands/install.rs
@@ -780,7 +780,7 @@ mod tests {
#[test]
fn test_compute_operations_all_new() {
- let locked = vec![
+ let locked = [
make_locked_package("psr/log", "3.0.0"),
make_locked_package("monolog/monolog", "3.8.0"),
];
@@ -797,7 +797,7 @@ mod tests {
#[test]
fn test_compute_operations_all_skipped() {
- let locked = vec![make_locked_package("psr/log", "3.0.0")];
+ let locked = [make_locked_package("psr/log", "3.0.0")];
let locked_refs: Vec<&lockfile::LockedPackage> = locked.iter().collect();
let mut installed = installed::InstalledPackages::new();
installed.upsert(make_installed_entry("psr/log", "3.0.0"));
@@ -811,7 +811,7 @@ mod tests {
#[test]
fn test_compute_operations_update_needed() {
- let locked = vec![make_locked_package("psr/log", "3.0.1")];
+ let locked = [make_locked_package("psr/log", "3.0.1")];
let locked_refs: Vec<&lockfile::LockedPackage> = locked.iter().collect();
let mut installed = installed::InstalledPackages::new();
installed.upsert(make_installed_entry("psr/log", "3.0.0"));
@@ -825,7 +825,7 @@ mod tests {
#[test]
fn test_compute_operations_removals() {
- let locked = vec![make_locked_package("psr/log", "3.0.0")];
+ let locked = [make_locked_package("psr/log", "3.0.0")];
let locked_refs: Vec<&lockfile::LockedPackage> = locked.iter().collect();
let mut installed = installed::InstalledPackages::new();
installed.upsert(make_installed_entry("psr/log", "3.0.0"));
@@ -841,7 +841,7 @@ mod tests {
#[test]
fn test_compute_operations_mixed() {
- let locked = vec![
+ let locked = [
make_locked_package("psr/log", "3.0.0"),
make_locked_package("symfony/console", "7.2.3"),
make_locked_package("monolog/monolog", "3.8.1"),
@@ -881,7 +881,7 @@ mod tests {
#[test]
fn test_compute_operations_case_insensitive() {
- let locked = vec![make_locked_package("Monolog/Monolog", "3.8.0")];
+ let locked = [make_locked_package("Monolog/Monolog", "3.8.0")];
let locked_refs: Vec<&lockfile::LockedPackage> = locked.iter().collect();
let mut installed = installed::InstalledPackages::new();
installed.upsert(make_installed_entry("monolog/monolog", "3.8.0"));
diff --git a/crates/mozart/src/commands/licenses.rs b/crates/mozart/src/commands/licenses.rs
index 9a46c94..50aaebe 100644
--- a/crates/mozart/src/commands/licenses.rs
+++ b/crates/mozart/src/commands/licenses.rs
@@ -722,7 +722,7 @@ mod tests {
let entries: Vec<LicenseEntry> = vec![];
// Single license string becomes a one-element array in JSON output
- let root_licenses = vec!["MIT".to_string()];
+ let root_licenses = ["MIT".to_string()];
let root_license_arr: Vec<serde_json::Value> = root_licenses
.iter()
.map(|s| serde_json::Value::String(s.clone()))
@@ -737,7 +737,7 @@ mod tests {
assert_eq!(output["license"][0], "MIT");
// Multiple licenses are also emitted as an array
- let root_licenses_multi = vec!["MIT".to_string(), "Apache-2.0".to_string()];
+ let root_licenses_multi = ["MIT".to_string(), "Apache-2.0".to_string()];
let root_license_arr_multi: Vec<serde_json::Value> = root_licenses_multi
.iter()
.map(|s| serde_json::Value::String(s.clone()))
diff --git a/crates/mozart/src/commands/reinstall.rs b/crates/mozart/src/commands/reinstall.rs
index 875d5f0..508915a 100644
--- a/crates/mozart/src/commands/reinstall.rs
+++ b/crates/mozart/src/commands/reinstall.rs
@@ -507,7 +507,7 @@ mod tests {
#[test]
fn test_find_locked_package_found() {
- let pkgs = vec![
+ let pkgs = [
make_locked_package("psr/log", "3.0.0"),
make_locked_package("monolog/monolog", "3.8.0"),
];
@@ -520,7 +520,7 @@ mod tests {
#[test]
fn test_find_locked_package_case_insensitive() {
- let pkgs = vec![make_locked_package("Monolog/Monolog", "3.8.0")];
+ let pkgs = [make_locked_package("Monolog/Monolog", "3.8.0")];
let refs: Vec<&mozart_registry::lockfile::LockedPackage> = pkgs.iter().collect();
let result = find_locked_package(&refs, "monolog/monolog");
@@ -529,7 +529,7 @@ mod tests {
#[test]
fn test_find_locked_package_not_found() {
- let pkgs = vec![make_locked_package("psr/log", "3.0.0")];
+ let pkgs = [make_locked_package("psr/log", "3.0.0")];
let refs: Vec<&mozart_registry::lockfile::LockedPackage> = pkgs.iter().collect();
let result = find_locked_package(&refs, "monolog/monolog");
diff --git a/crates/mozart/src/commands/search.rs b/crates/mozart/src/commands/search.rs
index b747b0e..accd6af 100644
--- a/crates/mozart/src/commands/search.rs
+++ b/crates/mozart/src/commands/search.rs
@@ -508,7 +508,7 @@ mod tests {
#[test]
fn test_only_vendor_deduplicates_vendor_names() {
- let results = vec![
+ let results = [
make_result("monolog/monolog"),
make_result("monolog/handler"),
make_result("monolog/formatter"),
diff --git a/crates/mozart/src/commands/suggests.rs b/crates/mozart/src/commands/suggests.rs
index 1dd898f..9a43211 100644
--- a/crates/mozart/src/commands/suggests.rs
+++ b/crates/mozart/src/commands/suggests.rs
@@ -639,7 +639,7 @@ mod tests {
#[test]
fn test_filter_removes_installed_targets() {
- let suggestions = vec![
+ let suggestions = [
make_suggestion("vendor/a", "ext-intl", "for internationalization"),
make_suggestion("vendor/b", "vendor/optional", "for extra features"),
make_suggestion("vendor/c", "ext-mbstring", "for string processing"),
@@ -662,7 +662,7 @@ mod tests {
#[test]
fn test_filter_by_package_names() {
- let suggestions = vec![
+ let suggestions = [
make_suggestion("vendor/a", "vendor/x", "reason"),
make_suggestion("vendor/b", "vendor/y", "reason"),
make_suggestion("vendor/c", "vendor/z", "reason"),
@@ -686,7 +686,7 @@ mod tests {
#[test]
fn test_filter_direct_deps_only() {
- let suggestions = vec![
+ let suggestions = [
make_suggestion("vendor/direct", "vendor/x", "reason"),
make_suggestion("vendor/transitive", "vendor/y", "reason"),
];
@@ -707,7 +707,7 @@ mod tests {
#[test]
fn test_filter_no_filter() {
- let suggestions = vec![
+ let suggestions = [
make_suggestion("vendor/a", "vendor/x", ""),
make_suggestion("vendor/b", "vendor/y", ""),
make_suggestion("vendor/c", "vendor/z", ""),