From 66c3eba15ba6302d43de057a9063f7feee8c6fb3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 11:10:53 +0900 Subject: refactor(pcre): extract composer/pcre into the shirabe-pcre crate Move `Composer\Pcre` out of shirabe-external-packages and into its own crate, so the path is `shirabe_pcre::preg::Preg` instead of `shirabe_external_packages::composer::pcre::preg::Preg`. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe-class-map-generator/Cargo.toml | 1 + crates/shirabe-class-map-generator/src/class_map.rs | 2 +- crates/shirabe-class-map-generator/src/class_map_generator.rs | 2 +- crates/shirabe-class-map-generator/src/php_file_cleaner.rs | 2 +- crates/shirabe-class-map-generator/src/php_file_parser.rs | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) (limited to 'crates/shirabe-class-map-generator') diff --git a/crates/shirabe-class-map-generator/Cargo.toml b/crates/shirabe-class-map-generator/Cargo.toml index a1c17d68..69889ef7 100644 --- a/crates/shirabe-class-map-generator/Cargo.toml +++ b/crates/shirabe-class-map-generator/Cargo.toml @@ -5,6 +5,7 @@ edition.workspace = true [dependencies] shirabe-external-packages.workspace = true +shirabe-pcre.workspace = true shirabe-php-shim.workspace = true anyhow.workspace = true indexmap.workspace = true diff --git a/crates/shirabe-class-map-generator/src/class_map.rs b/crates/shirabe-class-map-generator/src/class_map.rs index 65eb3790..4eb6ae48 100644 --- a/crates/shirabe-class-map-generator/src/class_map.rs +++ b/crates/shirabe-class-map-generator/src/class_map.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/composer/class-map-generator/src/ClassMap.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::Preg; +use shirabe_pcre::Preg; use shirabe_php_shim::{OutOfBoundsException, rtrim, strpos, strtr}; #[derive(Debug, Clone)] diff --git a/crates/shirabe-class-map-generator/src/class_map_generator.rs b/crates/shirabe-class-map-generator/src/class_map_generator.rs index 30a6ef1e..4a71b28d 100644 --- a/crates/shirabe-class-map-generator/src/class_map_generator.rs +++ b/crates/shirabe-class-map-generator/src/class_map_generator.rs @@ -4,8 +4,8 @@ use crate::class_map::ClassMap; use crate::file_list::FileList; use crate::php_file_parser::PhpFileParser; use indexmap::indexmap; -use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_external_packages::symfony::finder::Finder; +use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PATHINFO_EXTENSION, PHP_INT_MAX, RuntimeException, explode, getcwd, implode, is_dir, is_file, pathinfo, php_regex, preg_quote, realpath, diff --git a/crates/shirabe-class-map-generator/src/php_file_cleaner.rs b/crates/shirabe-class-map-generator/src/php_file_cleaner.rs index 7c555788..eb2b84e4 100644 --- a/crates/shirabe-class-map-generator/src/php_file_cleaner.rs +++ b/crates/shirabe-class-map-generator/src/php_file_cleaner.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/composer/class-map-generator/src/PhpFileCleaner.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_pcre::{CaptureKey, Preg}; use std::sync::Mutex; #[derive(Debug, Clone)] diff --git a/crates/shirabe-class-map-generator/src/php_file_parser.rs b/crates/shirabe-class-map-generator/src/php_file_parser.rs index 712fb4ab..ac0c8f1c 100644 --- a/crates/shirabe-class-map-generator/src/php_file_parser.rs +++ b/crates/shirabe-class-map-generator/src/php_file_parser.rs @@ -2,7 +2,7 @@ use crate::php_file_cleaner::PhpFileCleaner; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ CmpOp, HHVM_VERSION, PHP_EOL, PHP_VERSION_ID, RuntimeException, file_exists, file_get_contents, function_exists, is_file, is_readable, ltrim, php_strip_whitespace, str_replace_array, strrpos, -- cgit v1.3.1-4-g156e