aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe')
-rw-r--r--crates/shirabe/src/advisory/auditor.rs28
-rw-r--r--crates/shirabe/src/command/base_command.rs7
-rw-r--r--crates/shirabe/src/command/check_platform_reqs_command.rs11
-rw-r--r--crates/shirabe/src/command/licenses_command.rs25
-rw-r--r--crates/shirabe/tests/command/check_platform_reqs_command_test.rs11
5 files changed, 35 insertions, 47 deletions
diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs
index fd54595..6c520fb 100644
--- a/crates/shirabe/src/advisory/auditor.rs
+++ b/crates/shirabe/src/advisory/auditor.rs
@@ -467,10 +467,13 @@ impl Auditor {
table
.set_horizontal(true)
.set_headers(headers.into_iter().map(|h| h.into()).collect());
- table.add_row(ConsoleIO::sanitize(
- PhpMixed::List(row.into_iter().map(PhpMixed::String).collect()),
- false,
- ).into());
+ table.add_row(
+ ConsoleIO::sanitize(
+ PhpMixed::List(row.into_iter().map(PhpMixed::String).collect()),
+ false,
+ )
+ .into(),
+ );
table
.set_column_width(1, 80)
.set_column_max_width(1, 80)
@@ -589,13 +592,16 @@ impl Auditor {
} else {
"none".to_string()
};
- table.add_row(ConsoleIO::sanitize(
- PhpMixed::List(vec![
- PhpMixed::String(self.get_package_name_with_link(pkg.clone().into())),
- PhpMixed::String(replacement),
- ]),
- false,
- ).into());
+ table.add_row(
+ ConsoleIO::sanitize(
+ PhpMixed::List(vec![
+ PhpMixed::String(self.get_package_name_with_link(pkg.clone().into())),
+ PhpMixed::String(replacement),
+ ]),
+ false,
+ )
+ .into(),
+ );
}
table.render();
diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs
index f754d0a..f3c88e5 100644
--- a/crates/shirabe/src/command/base_command.rs
+++ b/crates/shirabe/src/command/base_command.rs
@@ -583,12 +583,7 @@ impl BaseCommand for BaseCommandData {
.expect("Table::set_style I/O cannot fail")
.expect("'compact' is a built-in table style");
renderer
- .set_rows(
- table
- .into_iter()
- .map(Into::into)
- .collect(),
- )
+ .set_rows(table.into_iter().map(Into::into).collect())
.render();
let _ = TableSeparator::new();
}
diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs
index 2ab66c5..a7f5d9c 100644
--- a/crates/shirabe/src/command/check_platform_reqs_command.rs
+++ b/crates/shirabe/src/command/check_platform_reqs_command.rs
@@ -285,13 +285,10 @@ impl Command for CheckPlatformReqsCommand {
let mut requires_sorted: Vec<(String, Vec<Link>)> = requires.into_iter().collect();
requires_sorted.sort_by(|a, b| a.0.cmp(&b.0));
- let installed_repo_with_platform = InstalledRepository::new(vec![
- crate::repository::RepositoryInterfaceHandle::new(installed_repo),
- crate::repository::RepositoryInterfaceHandle::new(PlatformRepository::new(
- vec![],
- indexmap::IndexMap::new(),
- )?),
- ]);
+ installed_repo.add_repository(crate::repository::RepositoryInterfaceHandle::new(
+ PlatformRepository::new(vec![], indexmap::IndexMap::new())?,
+ ));
+ let installed_repo_with_platform = installed_repo;
let mut results: Vec<CheckResult> = vec![];
let mut exit_code = 0;
diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs
index e8d62cc..f2672bd 100644
--- a/crates/shirabe/src/command/licenses_command.rs
+++ b/crates/shirabe/src/command/licenses_command.rs
@@ -201,11 +201,7 @@ impl Command for LicensesCommand {
let mut table = Table::new(output);
table.set_style("compact".into())??;
- table.set_headers(vec![
- "Name".into(),
- "Version".into(),
- "Licenses".into(),
- ]);
+ table.set_headers(vec!["Name".into(), "Version".into(), "Licenses".into()]);
for package in &packages {
let link = PackageInfo::get_view_source_or_homepage_url(package.clone());
let name = if let Some(link) = link {
@@ -227,14 +223,17 @@ impl Command for LicensesCommand {
} else {
pkg_licenses.join(", ")
};
- table.add_row(PhpMixed::List(vec![
- PhpMixed::String(name),
- PhpMixed::String(package.get_full_pretty_version(
- true,
- crate::package::DisplayMode::SourceRefIfDev,
- )),
- PhpMixed::String(licenses_str),
- ]).into());
+ table.add_row(
+ PhpMixed::List(vec![
+ PhpMixed::String(name),
+ PhpMixed::String(package.get_full_pretty_version(
+ true,
+ crate::package::DisplayMode::SourceRefIfDev,
+ )),
+ PhpMixed::String(licenses_str),
+ ])
+ .into(),
+ );
}
table.render();
}
diff --git a/crates/shirabe/tests/command/check_platform_reqs_command_test.rs b/crates/shirabe/tests/command/check_platform_reqs_command_test.rs
index 1e19259..a9196b7 100644
--- a/crates/shirabe/tests/command/check_platform_reqs_command_test.rs
+++ b/crates/shirabe/tests/command/check_platform_reqs_command_test.rs
@@ -48,11 +48,7 @@ fn run_platform_reqs_are_satisfied_case(
#[test]
#[serial]
-#[ignore = "src porting bug: check_platform_reqs_command.rs:288-294 wraps the existing \
- InstalledRepository inside a SECOND InstalledRepository (instead of PHP line 89 \
- `$installedRepo->addRepository(new PlatformRepository(...))`), tripping the \
- add_repository assertion at installed_repository.rs:367 (\"An InstalledRepository can \
- not contain a repository of type installed repo ...\"). Cannot fix from test files."]
+#[ignore = "reaches a RefCell re-entrancy panic at crates/shirabe/src/downloader/file_downloader.rs:136 (\"RefCell already borrowed\") on the platform-package resolution path; src borrow bug, not fixable from the test"]
fn test_platform_reqs_are_satisfied() {
// 'Disables checking of require-dev packages requirements.'
run_platform_reqs_are_satisfied_case(
@@ -105,11 +101,6 @@ fn test_exception_thrown_if_no_lockfile_found() {
#[test]
#[serial]
-#[ignore = "src porting bug: check_platform_reqs_command.rs:288-294 wraps the existing \
- InstalledRepository inside a SECOND InstalledRepository (instead of PHP line 89 \
- `$installedRepo->addRepository(new PlatformRepository(...))`), tripping the \
- add_repository assertion at installed_repository.rs:367 (\"An InstalledRepository can \
- not contain a repository of type installed repo ...\"). Cannot fix from test files."]
fn test_failed_platform_requirement() {
let tear_down = init_temp_composer(
Some(&serde_json::json!({
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-21 23:03:07 +0000