refactor: re-export module items to shorten import paths

12 files changed, 38 insertions, 31 deletions

diff --git a/crates/shirabe-semver/src/comparator.rs b/crates/shirabe-semver/src/comparator.rs
index 575a656..6db06d4 100644
--- a/crates/shirabe-semver/src/comparator.rs
+++ b/crates/shirabe-semver/src/comparator.rs
@@ -1,6 +1,6 @@
 //! ref: composer/vendor/composer/semver/src/Comparator.php
 
-use crate::constraint::constraint::Constraint;
+use crate::constraint::Constraint;
 
 pub struct Comparator;
 
diff --git a/crates/shirabe-semver/src/compiling_matcher.rs b/crates/shirabe-semver/src/compiling_matcher.rs
index f6a3689..737647f 100644
--- a/crates/shirabe-semver/src/compiling_matcher.rs
+++ b/crates/shirabe-semver/src/compiling_matcher.rs
@@ -5,8 +5,8 @@ use std::sync::OnceLock;
 
 use indexmap::IndexMap;
 
-use crate::constraint::constraint::Constraint;
-use crate::constraint::constraint_interface::ConstraintInterface;
+use crate::constraint::Constraint;
+use crate::constraint::ConstraintInterface;
 
 static COMPILED_CHECKER_CACHE: OnceLock<
     Mutex<IndexMap<String, Box<dyn Fn(String, bool) -> bool + Send + Sync>>>,
diff --git a/crates/shirabe-semver/src/constraint.rs b/crates/shirabe-semver/src/constraint.rs
index 8410b61..6a57a57 100644
--- a/crates/shirabe-semver/src/constraint.rs
+++ b/crates/shirabe-semver/src/constraint.rs
@@ -1,6 +1,13 @@
-pub mod bound;
-pub mod constraint;
-pub mod constraint_interface;
-pub mod match_all_constraint;
-pub mod match_none_constraint;
-pub mod multi_constraint;
+mod bound;
+mod constraint;
+mod constraint_interface;
+mod match_all_constraint;
+mod match_none_constraint;
+mod multi_constraint;
+
+pub use bound::*;
+pub use constraint::*;
+pub use constraint_interface::*;
+pub use match_all_constraint::*;
+pub use match_none_constraint::*;
+pub use multi_constraint::*;
diff --git a/crates/shirabe-semver/src/constraint/constraint.rs b/crates/shirabe-semver/src/constraint/constraint.rs
index 4ac4cda..3ac633d 100644
--- a/crates/shirabe-semver/src/constraint/constraint.rs
+++ b/crates/shirabe-semver/src/constraint/constraint.rs
@@ -5,8 +5,8 @@ use std::sync::Mutex;
 use anyhow::bail;
 use shirabe_php_shim as php;
 
-use crate::constraint::bound::Bound;
-use crate::constraint::constraint_interface::ConstraintInterface;
+use crate::constraint::Bound;
+use crate::constraint::ConstraintInterface;
 
 #[derive(Debug)]
 pub struct Constraint {
@@ -403,7 +403,7 @@ impl ConstraintInterface for Constraint {
 
 impl std::fmt::Display for Constraint {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        use crate::constraint::constraint_interface::ConstraintInterface;
+        use crate::constraint::ConstraintInterface;
         write!(f, "{}", ConstraintInterface::__to_string(self))
     }
 }
diff --git a/crates/shirabe-semver/src/constraint/constraint_interface.rs b/crates/shirabe-semver/src/constraint/constraint_interface.rs
index f4bd905..f04ed2a 100644
--- a/crates/shirabe-semver/src/constraint/constraint_interface.rs
+++ b/crates/shirabe-semver/src/constraint/constraint_interface.rs
@@ -1,6 +1,6 @@
 //! ref: composer/vendor/composer/semver/src/Constraint/ConstraintInterface.php
 
-use crate::constraint::bound::Bound;
+use crate::constraint::Bound;
 
 pub trait ConstraintInterface: std::fmt::Debug {
     fn matches(&self, provider: &dyn ConstraintInterface) -> bool;
diff --git a/crates/shirabe-semver/src/constraint/match_all_constraint.rs b/crates/shirabe-semver/src/constraint/match_all_constraint.rs
index 41aa32d..b695ce2 100644
--- a/crates/shirabe-semver/src/constraint/match_all_constraint.rs
+++ b/crates/shirabe-semver/src/constraint/match_all_constraint.rs
@@ -1,7 +1,7 @@
 //! ref: composer/vendor/composer/semver/src/Constraint/MatchAllConstraint.php
 
-use crate::constraint::bound::Bound;
-use crate::constraint::constraint_interface::ConstraintInterface;
+use crate::constraint::Bound;
+use crate::constraint::ConstraintInterface;
 
 #[derive(Debug)]
 pub struct MatchAllConstraint {
diff --git a/crates/shirabe-semver/src/constraint/match_none_constraint.rs b/crates/shirabe-semver/src/constraint/match_none_constraint.rs
index 51e13fd..587058a 100644
--- a/crates/shirabe-semver/src/constraint/match_none_constraint.rs
+++ b/crates/shirabe-semver/src/constraint/match_none_constraint.rs
@@ -1,7 +1,7 @@
 //! ref: composer/vendor/composer/semver/src/Constraint/MatchNoneConstraint.php
 
-use crate::constraint::bound::Bound;
-use crate::constraint::constraint_interface::ConstraintInterface;
+use crate::constraint::Bound;
+use crate::constraint::ConstraintInterface;
 
 #[derive(Debug)]
 pub struct MatchNoneConstraint {
diff --git a/crates/shirabe-semver/src/constraint/multi_constraint.rs b/crates/shirabe-semver/src/constraint/multi_constraint.rs
index 15397b6..4222095 100644
--- a/crates/shirabe-semver/src/constraint/multi_constraint.rs
+++ b/crates/shirabe-semver/src/constraint/multi_constraint.rs
@@ -2,9 +2,9 @@
 
 use std::cell::RefCell;
 
-use crate::constraint::bound::Bound;
-use crate::constraint::constraint_interface::ConstraintInterface;
-use crate::constraint::match_all_constraint::MatchAllConstraint;
+use crate::constraint::Bound;
+use crate::constraint::ConstraintInterface;
+use crate::constraint::MatchAllConstraint;
 
 pub struct MultiConstraint {
     pub(crate) constraints: Vec<Box<dyn ConstraintInterface>>,
diff --git a/crates/shirabe-semver/src/interval.rs b/crates/shirabe-semver/src/interval.rs
index 237ad0b..b1f3010 100644
--- a/crates/shirabe-semver/src/interval.rs
+++ b/crates/shirabe-semver/src/interval.rs
@@ -2,7 +2,7 @@
 
 use std::sync::OnceLock;
 
-use crate::constraint::constraint::Constraint;
+use crate::constraint::Constraint;
 
 #[derive(Debug, Clone)]
 pub struct DevConstraintSet {
diff --git a/crates/shirabe-semver/src/intervals.rs b/crates/shirabe-semver/src/intervals.rs
index 384cb4e..72231b6 100644
--- a/crates/shirabe-semver/src/intervals.rs
+++ b/crates/shirabe-semver/src/intervals.rs
@@ -3,11 +3,11 @@
 use std::collections::HashMap;
 use std::sync::{Mutex, OnceLock};
 
-use crate::constraint::constraint::Constraint;
-use crate::constraint::constraint_interface::ConstraintInterface;
-use crate::constraint::match_all_constraint::MatchAllConstraint;
-use crate::constraint::match_none_constraint::MatchNoneConstraint;
-use crate::constraint::multi_constraint::MultiConstraint;
+use crate::constraint::Constraint;
+use crate::constraint::ConstraintInterface;
+use crate::constraint::MatchAllConstraint;
+use crate::constraint::MatchNoneConstraint;
+use crate::constraint::MultiConstraint;
 use crate::interval::{DevConstraintSet, Interval};
 use shirabe_php_shim as php;
 
diff --git a/crates/shirabe-semver/src/semver.rs b/crates/shirabe-semver/src/semver.rs
index 28e74a6..62f50b6 100644
--- a/crates/shirabe-semver/src/semver.rs
+++ b/crates/shirabe-semver/src/semver.rs
@@ -3,7 +3,7 @@
 use std::sync::OnceLock;
 
 use crate::comparator::Comparator;
-use crate::constraint::constraint::Constraint;
+use crate::constraint::Constraint;
 use crate::version_parser::VersionParser;
 
 pub struct Semver;
diff --git a/crates/shirabe-semver/src/version_parser.rs b/crates/shirabe-semver/src/version_parser.rs
index 39000e7..ba2b59d 100644
--- a/crates/shirabe-semver/src/version_parser.rs
+++ b/crates/shirabe-semver/src/version_parser.rs
@@ -1,9 +1,9 @@
 //! ref: composer/vendor/composer/semver/src/VersionParser.php
 
-use crate::constraint::constraint::Constraint;
-use crate::constraint::constraint_interface::ConstraintInterface;
-use crate::constraint::match_all_constraint::MatchAllConstraint;
-use crate::constraint::multi_constraint::MultiConstraint;
+use crate::constraint::Constraint;
+use crate::constraint::ConstraintInterface;
+use crate::constraint::MatchAllConstraint;
+use crate::constraint::MultiConstraint;
 use shirabe_php_shim as php;
 
 // Regex to match pre-release data (sort of).