aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/advisory
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/advisory')
-rw-r--r--crates/shirabe/src/advisory/audit_config.rs5
-rw-r--r--crates/shirabe/src/advisory/auditor.rs17
-rw-r--r--crates/shirabe/src/advisory/mod.rs13
-rw-r--r--crates/shirabe/src/advisory/security_advisory.rs5
4 files changed, 12 insertions, 28 deletions
diff --git a/crates/shirabe/src/advisory/audit_config.rs b/crates/shirabe/src/advisory/audit_config.rs
index 28e5e68..458ebef 100644
--- a/crates/shirabe/src/advisory/audit_config.rs
+++ b/crates/shirabe/src/advisory/audit_config.rs
@@ -1,10 +1,9 @@
//! ref: composer/src/Composer/Advisory/AuditConfig.php
-use indexmap::IndexMap;
-use shirabe_php_shim::{InvalidArgumentException, PhpMixed};
-
use crate::advisory::Auditor;
use crate::config::Config;
+use indexmap::IndexMap;
+use shirabe_php_shim::{InvalidArgumentException, PhpMixed};
#[derive(Debug, Clone)]
pub struct AuditConfig {
diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs
index 4331b7b..be78f4b 100644
--- a/crates/shirabe/src/advisory/auditor.rs
+++ b/crates/shirabe/src/advisory/auditor.rs
@@ -1,14 +1,5 @@
//! ref: composer/src/Composer/Advisory/Auditor.php
-use anyhow::Result;
-use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
-use shirabe_php_shim::{
- DATE_ATOM, InvalidArgumentException, PhpMixed, array_all, array_any, array_key_exists,
- array_keys, array_reduce, get_class, sprintf, str_starts_with,
-};
-
use crate::advisory::AnySecurityAdvisory;
use crate::advisory::SecurityAdvisory;
use crate::io::ConsoleIO;
@@ -19,6 +10,14 @@ use crate::package::PackageInterfaceHandle;
use crate::package::base_package;
use crate::repository::RepositorySet;
use crate::util::PackageInfo;
+use anyhow::Result;
+use indexmap::IndexMap;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
+use shirabe_php_shim::{
+ DATE_ATOM, InvalidArgumentException, PhpMixed, array_all, array_any, array_key_exists,
+ array_keys, array_reduce, get_class, sprintf, str_starts_with,
+};
/// Shape of the `--format=json` audit output.
#[derive(serde::Serialize)]
diff --git a/crates/shirabe/src/advisory/mod.rs b/crates/shirabe/src/advisory/mod.rs
deleted file mode 100644
index dbb90bd..0000000
--- a/crates/shirabe/src/advisory/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub mod any_security_advisory;
-pub mod audit_config;
-pub mod auditor;
-pub mod ignored_security_advisory;
-pub mod partial_security_advisory;
-pub mod security_advisory;
-
-pub use any_security_advisory::*;
-pub use audit_config::*;
-pub use auditor::*;
-pub use ignored_security_advisory::*;
-pub use partial_security_advisory::*;
-pub use security_advisory::*;
diff --git a/crates/shirabe/src/advisory/security_advisory.rs b/crates/shirabe/src/advisory/security_advisory.rs
index 78a2562..298a9e6 100644
--- a/crates/shirabe/src/advisory/security_advisory.rs
+++ b/crates/shirabe/src/advisory/security_advisory.rs
@@ -1,13 +1,12 @@
//! ref: composer/src/Composer/Advisory/SecurityAdvisory.php
+use crate::advisory::IgnoredSecurityAdvisory;
+use crate::advisory::PartialSecurityAdvisory;
use chrono::{DateTime, Utc};
use indexmap::IndexMap;
use shirabe_php_shim::DATE_RFC3339;
use shirabe_semver::constraint::AnyConstraint;
-use crate::advisory::IgnoredSecurityAdvisory;
-use crate::advisory::PartialSecurityAdvisory;
-
fn serialize_date_rfc3339<S: serde::Serializer>(
dt: &DateTime<Utc>,
serializer: S,