diff options
Diffstat (limited to 'crates/shirabe/src/package')
| -rw-r--r-- | crates/shirabe/src/package/archiver/git_exclude_filter.rs | 5 | ||||
| -rw-r--r-- | crates/shirabe/src/package/loader/root_package_loader.rs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/crates/shirabe/src/package/archiver/git_exclude_filter.rs b/crates/shirabe/src/package/archiver/git_exclude_filter.rs index 3dd104ca..e3b35349 100644 --- a/crates/shirabe/src/package/archiver/git_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/git_exclude_filter.rs @@ -2,8 +2,7 @@ use crate::package::archiver::BaseExcludeFilter; use crate::package::archiver::BaseExcludeFilterBase; -use shirabe_pcre::Preg; -use shirabe_php_shim::php_regex; +use shirabe_php_shim::{php_regex, preg_split}; use std::path::Path; pub struct GitExcludeFilter { @@ -36,7 +35,7 @@ impl GitExcludeFilter { } fn parse_git_attributes_line_static(line: &str) -> Option<(String, bool, bool)> { - let parts = Preg::split(php_regex!(r"#\s+#"), line); + let parts = preg_split(php_regex!(r"#\s+#"), line); if parts.len() == 2 && parts[1] == "export-ignore" { return Some(BaseExcludeFilterBase::generate_pattern(&parts[0])); diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 0ee355f0..58a06ebd 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -17,7 +17,7 @@ use crate::util::ProcessExecutor; use indexmap::IndexMap; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ - PhpMixed, RuntimeException, UnexpectedValueException, php_regex, strtolower, + PhpMixed, RuntimeException, UnexpectedValueException, php_regex, preg_split, strtolower, }; #[derive(Debug)] @@ -305,7 +305,7 @@ impl RootPackageLoader { for (req_name, req_version) in requires { let mut constraints: Vec<String> = vec![]; - let or_split = Preg::split(php_regex!(r"{\s*\|\|?\s*}"), req_version.trim()); + let or_split = preg_split(php_regex!(r"{\s*\|\|?\s*}"), req_version.trim()); for or_constraint in &or_split { let and_split = shirabe_semver::split_and_constraints(or_constraint); for and_constraint in and_split { |