aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/package')
-rw-r--r--crates/shirabe/src/package/alias_package.rs6
-rw-r--r--crates/shirabe/src/package/dumper/array_dumper.rs144
-rw-r--r--crates/shirabe/src/package/loader/array_loader.rs51
-rw-r--r--crates/shirabe/src/package/loader/json_loader.rs2
-rw-r--r--crates/shirabe/src/package/loader/root_package_loader.rs23
-rw-r--r--crates/shirabe/src/package/loader/validating_array_loader.rs221
-rw-r--r--crates/shirabe/src/package/locker.rs121
-rw-r--r--crates/shirabe/src/package/version/version_guesser.rs10
8 files changed, 207 insertions, 371 deletions
diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs
index 657b007..c0e71ec 100644
--- a/crates/shirabe/src/package/alias_package.rs
+++ b/crates/shirabe/src/package/alias_package.rs
@@ -135,9 +135,9 @@ impl AliasPackage {
if in_array(
PhpMixed::String(link_type.to_string()),
&PhpMixed::List(vec![
- Box::new(PhpMixed::String(Link::TYPE_CONFLICT.to_string())),
- Box::new(PhpMixed::String(Link::TYPE_PROVIDE.to_string())),
- Box::new(PhpMixed::String(Link::TYPE_REPLACE.to_string())),
+ PhpMixed::String(Link::TYPE_CONFLICT.to_string()),
+ PhpMixed::String(Link::TYPE_PROVIDE.to_string()),
+ PhpMixed::String(Link::TYPE_REPLACE.to_string()),
]),
true,
) {
diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs
index 7bf62f2..ec33340 100644
--- a/crates/shirabe/src/package/dumper/array_dumper.rs
+++ b/crates/shirabe/src/package/dumper/array_dumper.rs
@@ -9,12 +9,9 @@ use crate::package::SUPPORTED_LINK_TYPES;
/// Serializes a Mirror back into the PHP array shape `{url, preferred}`.
fn mirror_to_php(mirror: Mirror) -> PhpMixed {
- let mut entry: IndexMap<String, Box<PhpMixed>> = IndexMap::new();
- entry.insert("url".to_string(), Box::new(PhpMixed::String(mirror.url)));
- entry.insert(
- "preferred".to_string(),
- Box::new(PhpMixed::Bool(mirror.preferred)),
- );
+ let mut entry: IndexMap<String, PhpMixed> = IndexMap::new();
+ entry.insert("url".to_string(), PhpMixed::String(mirror.url));
+ entry.insert("preferred".to_string(), PhpMixed::Bool(mirror.preferred));
PhpMixed::Array(entry)
}
@@ -55,21 +52,19 @@ impl ArrayDumper {
}
if let Some(source_type) = package.get_source_type() {
- let mut source: IndexMap<String, Box<PhpMixed>> = IndexMap::new();
+ let mut source = IndexMap::new();
source.insert(
"type".to_string(),
- Box::new(PhpMixed::String(source_type.to_string())),
+ PhpMixed::String(source_type.to_string()),
);
source.insert(
"url".to_string(),
- Box::new(PhpMixed::String(
- package.get_source_url().unwrap_or_default(),
- )),
+ PhpMixed::String(package.get_source_url().unwrap_or_default()),
);
if let Some(reference) = package.get_source_reference() {
source.insert(
"reference".to_string(),
- Box::new(PhpMixed::String(reference.to_string())),
+ PhpMixed::String(reference.to_string()),
);
}
if let Some(mirrors) = package.get_source_mirrors()
@@ -77,52 +72,46 @@ impl ArrayDumper {
{
source.insert(
"mirrors".to_string(),
- Box::new(PhpMixed::Array(
+ PhpMixed::Array(
mirrors
.into_iter()
.enumerate()
- .map(|(i, m)| (i.to_string(), Box::new(mirror_to_php(m))))
+ .map(|(i, m)| (i.to_string(), mirror_to_php(m)))
.collect(),
- )),
+ ),
);
}
data.insert("source".to_string(), PhpMixed::Array(source));
}
if let Some(dist_type) = package.get_dist_type() {
- let mut dist: IndexMap<String, Box<PhpMixed>> = IndexMap::new();
- dist.insert(
- "type".to_string(),
- Box::new(PhpMixed::String(dist_type.to_string())),
- );
+ let mut dist: IndexMap<String, PhpMixed> = IndexMap::new();
+ dist.insert("type".to_string(), PhpMixed::String(dist_type.to_string()));
dist.insert(
"url".to_string(),
- Box::new(PhpMixed::String(package.get_dist_url().unwrap_or_default())),
+ PhpMixed::String(package.get_dist_url().unwrap_or_default()),
);
if let Some(reference) = package.get_dist_reference() {
dist.insert(
"reference".to_string(),
- Box::new(PhpMixed::String(reference.to_string())),
+ PhpMixed::String(reference.to_string()),
);
}
if let Some(shasum) = package.get_dist_sha1_checksum() {
- dist.insert(
- "shasum".to_string(),
- Box::new(PhpMixed::String(shasum.to_string())),
- );
+ dist.insert("shasum".to_string(), PhpMixed::String(shasum.to_string()));
}
if let Some(mirrors) = package.get_dist_mirrors()
&& !mirrors.is_empty()
{
dist.insert(
"mirrors".to_string(),
- Box::new(PhpMixed::Array(
+ PhpMixed::Array(
mirrors
.into_iter()
.enumerate()
- .map(|(i, m)| (i.to_string(), Box::new(mirror_to_php(m))))
+ .map(|(i, m)| (i.to_string(), mirror_to_php(m)))
.collect(),
- )),
+ ),
);
}
data.insert("dist".to_string(), PhpMixed::Array(dist));
@@ -133,11 +122,11 @@ impl ArrayDumper {
if links.is_empty() {
continue;
}
- let mut link_map: IndexMap<String, Box<PhpMixed>> = IndexMap::new();
+ let mut link_map: IndexMap<String, PhpMixed> = IndexMap::new();
for link in links.values() {
link_map.insert(
link.get_target().to_string(),
- Box::new(PhpMixed::String(link.get_pretty_constraint().to_string())),
+ PhpMixed::String(link.get_pretty_constraint().to_string()),
);
}
link_map.sort_keys();
@@ -153,7 +142,7 @@ impl ArrayDumper {
PhpMixed::Array(
sorted_suggests
.into_iter()
- .map(|(k, v)| (k, Box::new(PhpMixed::String(v))))
+ .map(|(k, v)| (k, PhpMixed::String(v)))
.collect(),
),
);
@@ -175,12 +164,7 @@ impl ArrayDumper {
if !binaries.is_empty() {
data.insert(
"bin".to_string(),
- PhpMixed::List(
- binaries
- .into_iter()
- .map(|b| Box::new(PhpMixed::String(b)))
- .collect(),
- ),
+ PhpMixed::List(binaries.into_iter().map(PhpMixed::String).collect()),
);
}
let pkg_type = package.get_type();
@@ -191,7 +175,7 @@ impl ArrayDumper {
if !extra.is_empty() {
data.insert(
"extra".to_string(),
- PhpMixed::Array(extra.into_iter().map(|(k, v)| (k, Box::new(v))).collect()),
+ PhpMixed::Array(extra.into_iter().collect()),
);
}
if let Some(installation_source) = package.get_installation_source() {
@@ -204,24 +188,14 @@ impl ArrayDumper {
if !autoload.is_empty() {
data.insert(
"autoload".to_string(),
- PhpMixed::Array(
- autoload
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
- ),
+ PhpMixed::Array(autoload.into_iter().collect()),
);
}
let dev_autoload = package.get_dev_autoload();
if !dev_autoload.is_empty() {
data.insert(
"autoload-dev".to_string(),
- PhpMixed::Array(
- dev_autoload
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
- ),
+ PhpMixed::Array(dev_autoload.into_iter().collect()),
);
}
if let Some(notification_url) = package.get_notification_url() {
@@ -234,12 +208,7 @@ impl ArrayDumper {
if !include_paths.is_empty() {
data.insert(
"include-path".to_string(),
- PhpMixed::List(
- include_paths
- .into_iter()
- .map(|p| Box::new(PhpMixed::String(p)))
- .collect(),
- ),
+ PhpMixed::List(include_paths.into_iter().map(PhpMixed::String).collect()),
);
}
let php_ext = package.get_php_ext();
@@ -249,7 +218,7 @@ impl ArrayDumper {
PhpMixed::Array(
php_ext
.iter()
- .map(|(k, v)| (k.clone(), Box::new(v.clone())))
+ .map(|(k, v)| (k.clone(), v.clone()))
.collect(),
),
);
@@ -263,7 +232,7 @@ impl ArrayDumper {
if let PhpMixed::Array(archive) = entry {
archive.insert(
"name".to_string(),
- Box::new(PhpMixed::String(archive_name.to_string())),
+ PhpMixed::String(archive_name.to_string()),
);
}
}
@@ -275,12 +244,9 @@ impl ArrayDumper {
if let PhpMixed::Array(archive) = entry {
archive.insert(
"exclude".to_string(),
- Box::new(PhpMixed::List(
- archive_excludes
- .into_iter()
- .map(|e| Box::new(PhpMixed::String(e)))
- .collect(),
- )),
+ PhpMixed::List(
+ archive_excludes.into_iter().map(PhpMixed::String).collect(),
+ ),
);
}
}
@@ -296,11 +262,7 @@ impl ArrayDumper {
.map(|(k, v)| {
(
k,
- Box::new(PhpMixed::List(
- v.into_iter()
- .map(|s| Box::new(PhpMixed::String(s)))
- .collect(),
- )),
+ PhpMixed::List(v.into_iter().map(PhpMixed::String).collect()),
)
})
.collect(),
@@ -311,12 +273,7 @@ impl ArrayDumper {
if !license.is_empty() {
data.insert(
"license".to_string(),
- PhpMixed::List(
- license
- .into_iter()
- .map(|l| Box::new(PhpMixed::String(l)))
- .collect(),
- ),
+ PhpMixed::List(license.into_iter().map(PhpMixed::String).collect()),
);
}
let authors = complete_pkg.get_authors();
@@ -327,11 +284,11 @@ impl ArrayDumper {
authors
.into_iter()
.map(|a| {
- Box::new(PhpMixed::Array(
+ PhpMixed::Array(
a.into_iter()
- .map(|(k, v)| (k, Box::new(PhpMixed::String(v))))
+ .map(|(k, v)| (k, PhpMixed::String(v)))
.collect(),
- ))
+ )
})
.collect(),
),
@@ -354,24 +311,14 @@ impl ArrayDumper {
keywords.sort();
data.insert(
"keywords".to_string(),
- PhpMixed::List(
- keywords
- .into_iter()
- .map(|k| Box::new(PhpMixed::String(k)))
- .collect(),
- ),
+ PhpMixed::List(keywords.into_iter().map(PhpMixed::String).collect()),
);
}
let repositories = complete_pkg.get_repositories();
if !repositories.is_empty() {
data.insert(
"repositories".to_string(),
- PhpMixed::Array(
- repositories
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
- ),
+ PhpMixed::Array(repositories.into_iter().collect()),
);
}
let support = complete_pkg.get_support();
@@ -381,7 +328,7 @@ impl ArrayDumper {
PhpMixed::Array(
support
.into_iter()
- .map(|(k, v)| (k, Box::new(PhpMixed::String(v))))
+ .map(|(k, v)| (k, PhpMixed::String(v)))
.collect(),
),
);
@@ -393,11 +340,7 @@ impl ArrayDumper {
PhpMixed::List(
funding
.into_iter()
- .map(|f| {
- Box::new(PhpMixed::Array(
- f.into_iter().map(|(k, v)| (k, Box::new(v))).collect(),
- ))
- })
+ .map(|f| PhpMixed::Array(f.into_iter().collect()))
.collect(),
),
);
@@ -426,12 +369,7 @@ impl ArrayDumper {
if !transport_options.is_empty() {
data.insert(
"transport-options".to_string(),
- PhpMixed::Array(
- transport_options
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
- ),
+ PhpMixed::Array(transport_options.into_iter().collect()),
);
}
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs
index 889624d..0411645 100644
--- a/crates/shirabe/src/package/loader/array_loader.rs
+++ b/crates/shirabe/src/package/loader/array_loader.rs
@@ -92,14 +92,14 @@ impl CompleteOrRootPackage {
fn php_to_map(value: &PhpMixed) -> IndexMap<String, PhpMixed> {
match value {
- PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect(),
+ PhpMixed::Array(m) => m.clone(),
_ => IndexMap::new(),
}
}
fn php_to_string_vec(value: &PhpMixed) -> Vec<String> {
match value {
- PhpMixed::List(l) => l.iter().map(|v| strval(v)).collect(),
+ PhpMixed::List(l) => l.iter().map(strval).collect(),
PhpMixed::Array(m) => m.values().map(|v| strval(v)).collect(),
_ => Vec::new(),
}
@@ -121,8 +121,8 @@ fn apply_link_setter(package: &mut Package, method: &str, links: IndexMap<String
fn php_to_mirrors(value: &PhpMixed) -> Vec<Mirror> {
let entries: Vec<&PhpMixed> = match value {
- PhpMixed::List(l) => l.iter().map(|v| v.as_ref()).collect(),
- PhpMixed::Array(m) => m.values().map(|v| v.as_ref()).collect(),
+ PhpMixed::List(l) => l.iter().collect(),
+ PhpMixed::Array(m) => m.values().collect(),
_ => Vec::new(),
};
entries
@@ -180,10 +180,7 @@ impl LoaderInterface for ArrayLoader {
package.get_pretty_version(),
opts.method,
match entry.unwrap() {
- PhpMixed::Array(arr) => arr
- .iter()
- .map(|(k, v)| (k.clone(), (**v).clone()))
- .collect(),
+ PhpMixed::Array(arr) => arr.clone(),
_ => IndexMap::new(),
},
)?;
@@ -231,13 +228,7 @@ impl ArrayLoader {
return Err(UnexpectedValueException {
message: format!(
"Unknown package has no name defined ({}).",
- json_encode(&PhpMixed::Array(
- config
- .iter()
- .map(|(k, v)| (k.clone(), Box::new(v.clone())))
- .collect(),
- ))
- .unwrap_or_default()
+ json_encode(&PhpMixed::Array(config.clone())).unwrap_or_default()
),
code: 0,
}
@@ -347,18 +338,18 @@ impl ArrayLoader {
if let Some(bin) = config.get("bin").cloned() {
let mut bin_list = match bin {
PhpMixed::Array(_) | PhpMixed::List(_) => bin,
- other => PhpMixed::List(vec![Box::new(other)]),
+ other => PhpMixed::List(vec![other]),
};
if let PhpMixed::List(ref mut list) = bin_list {
for item in list.iter_mut() {
if let Some(s) = item.as_string() {
- **item = PhpMixed::String(ltrim(s, Some("/")));
+ *item = PhpMixed::String(ltrim(s, Some("/")));
}
}
} else if let PhpMixed::Array(ref mut map) = bin_list {
for (_k, v) in map.iter_mut() {
if let Some(s) = v.as_string() {
- **v = PhpMixed::String(ltrim(s, Some("/")));
+ *v = PhpMixed::String(ltrim(s, Some("/")));
}
}
}
@@ -477,7 +468,7 @@ impl ArrayLoader {
if let Some(r) = reason.as_string()
&& trim(r, None) == "self.version"
{
- **reason = PhpMixed::String(package.get_pretty_version().to_string());
+ *reason = PhpMixed::String(package.get_pretty_version().to_string());
let _ = target;
}
}
@@ -553,9 +544,9 @@ impl ArrayLoader {
&& let PhpMixed::Array(mut scripts_map) = scripts
{
for (event, listeners) in scripts_map.iter_mut() {
- let listeners_array = match listeners.as_ref() {
+ let listeners_array = match &*listeners {
PhpMixed::Array(_) | PhpMixed::List(_) => listeners.clone(),
- other => Box::new(PhpMixed::List(vec![Box::new(other.clone())])),
+ other => PhpMixed::List(vec![other.clone()]),
};
*listeners = listeners_array;
let _ = event;
@@ -602,7 +593,7 @@ impl ArrayLoader {
&& matches!(keywords, PhpMixed::Array(_) | PhpMixed::List(_))
{
let keywords_vec: Vec<String> = match keywords {
- PhpMixed::List(list) => list.iter().map(|v| strval(v)).collect(),
+ PhpMixed::List(list) => list.iter().map(strval).collect(),
PhpMixed::Array(map) => map.values().map(|v| strval(v)).collect(),
_ => vec![],
};
@@ -632,7 +623,7 @@ impl ArrayLoader {
{
let authors_vec: Vec<IndexMap<String, String>> = list
.iter()
- .filter_map(|v| match v.as_ref() {
+ .filter_map(|v| match v {
PhpMixed::Array(m) => Some(
m.iter()
.map(|(k, v)| (k.clone(), v.as_string().unwrap_or("").to_string()))
@@ -660,10 +651,8 @@ impl ArrayLoader {
{
let funding_vec: Vec<IndexMap<String, PhpMixed>> = list
.iter()
- .filter_map(|v| match v.as_ref() {
- PhpMixed::Array(m) => {
- Some(m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect())
- }
+ .filter_map(|v| match v {
+ PhpMixed::Array(m) => Some(m.clone()),
_ => None,
})
.collect();
@@ -722,9 +711,7 @@ impl ArrayLoader {
if let Some(entry) = config.get(*r#type) {
let mut links: IndexMap<String, Link> = IndexMap::new();
let entries: IndexMap<String, PhpMixed> = match entry {
- PhpMixed::Array(m) => {
- m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()
- }
+ PhpMixed::Array(m) => m.clone(),
_ => continue,
};
for (pretty_target, constraint) in entries {
@@ -892,8 +879,8 @@ impl ArrayLoader {
PhpMixed::Array(m) => m.get("branch-alias").cloned(),
_ => None,
})
- .and_then(|v| match v.as_ref() {
- PhpMixed::Array(m) => Some(m.clone()),
+ .and_then(|v| match v {
+ PhpMixed::Array(m) => Some(m),
_ => None,
});
diff --git a/crates/shirabe/src/package/loader/json_loader.rs b/crates/shirabe/src/package/loader/json_loader.rs
index fa0e914..d48a2fe 100644
--- a/crates/shirabe/src/package/loader/json_loader.rs
+++ b/crates/shirabe/src/package/loader/json_loader.rs
@@ -33,7 +33,7 @@ impl JsonLoader {
};
let config: IndexMap<String, PhpMixed> = match config {
- PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(),
+ PhpMixed::Array(m) => m,
_ => {
return Err(TypeError {
message: "Composer\\Package\\Loader\\LoaderInterface::load(): Argument #1 ($config) must be of type array".to_string(),
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 2d3bd0a..50374d2 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -129,27 +129,18 @@ impl RootPackageLoader {
if let Some(commit_hash) = commit {
let mut source = IndexMap::new();
- source.insert(
- "type".to_string(),
- Box::new(PhpMixed::String(String::new())),
- );
- source.insert("url".to_string(), Box::new(PhpMixed::String(String::new())));
+ source.insert("type".to_string(), PhpMixed::String(String::new()));
+ source.insert("url".to_string(), PhpMixed::String(String::new()));
source.insert(
"reference".to_string(),
- Box::new(PhpMixed::String(commit_hash.clone())),
+ PhpMixed::String(commit_hash.clone()),
);
config.insert("source".to_string(), PhpMixed::Array(source));
let mut dist = IndexMap::new();
- dist.insert(
- "type".to_string(),
- Box::new(PhpMixed::String(String::new())),
- );
- dist.insert("url".to_string(), Box::new(PhpMixed::String(String::new())));
- dist.insert(
- "reference".to_string(),
- Box::new(PhpMixed::String(commit_hash)),
- );
+ dist.insert("type".to_string(), PhpMixed::String(String::new()));
+ dist.insert("url".to_string(), PhpMixed::String(String::new()));
+ dist.insert("reference".to_string(), PhpMixed::String(commit_hash));
config.insert("dist".to_string(), PhpMixed::Array(dist));
}
}
@@ -249,7 +240,7 @@ impl RootPackageLoader {
real_package.set_config(
pkg_config
.iter()
- .map(|(k, v)| (k.clone(), (**v).clone()))
+ .map(|(k, v)| (k.clone(), v.clone()))
.collect(),
);
}
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index 490c0a9..cb7b7ae 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -28,7 +28,7 @@ pub struct ValidatingArrayLoader {
version_parser: VersionParser,
errors: Vec<String>,
warnings: Vec<String>,
- config: IndexMap<String, Box<PhpMixed>>,
+ config: IndexMap<String, PhpMixed>,
flags: i64,
}
@@ -64,7 +64,7 @@ impl ValidatingArrayLoader {
pub fn load(
&mut self,
- config: IndexMap<String, Box<PhpMixed>>,
+ config: IndexMap<String, PhpMixed>,
class: &str,
) -> anyhow::Result<crate::package::PackageInterfaceHandle> {
self.errors = Vec::new();
@@ -86,7 +86,7 @@ impl ValidatingArrayLoader {
if !is_string(&version_val) {
self.config.insert(
"version".to_string(),
- Box::new(PhpMixed::String(php_to_string(&version_val))),
+ PhpMixed::String(php_to_string(&version_val)),
);
}
let version_str = self
@@ -113,16 +113,16 @@ impl ValidatingArrayLoader {
.cloned()
&& let Some(platform_val) = config_section.get("platform")
{
- let platform_array: IndexMap<String, Box<PhpMixed>> = match platform_val.as_ref() {
+ let platform_array: IndexMap<String, PhpMixed> = match platform_val {
PhpMixed::Array(m) => m.clone(),
other => {
let mut m = IndexMap::new();
- m.insert("0".to_string(), Box::new(other.clone()));
+ m.insert("0".to_string(), other.clone());
m
}
};
for (key, platform) in &platform_array {
- if let PhpMixed::Bool(false) = platform.as_ref() {
+ if let PhpMixed::Bool(false) = platform {
continue;
}
if !is_string(platform) {
@@ -181,11 +181,11 @@ impl ValidatingArrayLoader {
let license_val = self.config["license"].clone();
// validate main data types
if is_array(&license_val) || is_string(&license_val) {
- let mut licenses: IndexMap<String, Box<PhpMixed>> = match license_val.as_ref() {
+ let mut licenses: IndexMap<String, PhpMixed> = match &license_val {
PhpMixed::Array(m) => m.clone(),
other => {
let mut m = IndexMap::new();
- m.insert("0".to_string(), Box::new(other.clone()));
+ m.insert("0".to_string(), other.clone());
m
}
};
@@ -196,7 +196,7 @@ impl ValidatingArrayLoader {
if !is_string(&license) {
self.warnings.push(format!(
"License {} should be a string.",
- PhpMixed::String(json_encode(&*license).unwrap_or_default()),
+ PhpMixed::String(json_encode(&license).unwrap_or_default()),
));
licenses.shift_remove(index);
}
@@ -238,19 +238,17 @@ impl ValidatingArrayLoader {
}
}
- let reindexed: Vec<Box<PhpMixed>> = array_values(&licenses);
- let mut reindexed_map: IndexMap<String, Box<PhpMixed>> = IndexMap::new();
+ let reindexed: Vec<PhpMixed> = array_values(&licenses);
+ let mut reindexed_map: IndexMap<String, PhpMixed> = IndexMap::new();
for (i, v) in reindexed.into_iter().enumerate() {
reindexed_map.insert(i.to_string(), v);
}
- self.config.insert(
- "license".to_string(),
- Box::new(PhpMixed::Array(reindexed_map)),
- );
+ self.config
+ .insert("license".to_string(), PhpMixed::Array(reindexed_map));
} else {
self.warnings.push(format!(
"License must be a string or array of strings, got {}.",
- PhpMixed::String(json_encode(&*license_val).unwrap_or_default(),),
+ PhpMixed::String(json_encode(&license_val).unwrap_or_default(),),
));
self.config.shift_remove("license");
}
@@ -269,9 +267,7 @@ impl ValidatingArrayLoader {
key,
get_debug_type(&author)
));
- if let Some(PhpMixed::Array(m)) =
- self.config.get_mut("authors").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(m)) = self.config.get_mut("authors") {
m.shift_remove(key);
}
continue;
@@ -285,10 +281,9 @@ impl ValidatingArrayLoader {
"authors.{}.{} : invalid value, must be a string",
key, author_data
));
- if let Some(PhpMixed::Array(authors)) =
- self.config.get_mut("authors").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(authors)) = self.config.get_mut("authors")
&& let Some(author_entry) = authors.get_mut(key)
- && let PhpMixed::Array(am) = author_entry.as_mut()
+ && let PhpMixed::Array(am) = author_entry
{
am.shift_remove(author_data);
}
@@ -306,10 +301,9 @@ impl ValidatingArrayLoader {
"authors.{}.homepage : invalid value ({}), must be an http/https URL",
key, homepage_str
));
- if let Some(PhpMixed::Array(authors)) =
- self.config.get_mut("authors").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(authors)) = self.config.get_mut("authors")
&& let Some(author_entry) = authors.get_mut(key)
- && let PhpMixed::Array(am) = author_entry.as_mut()
+ && let PhpMixed::Array(am) = author_entry
{
am.shift_remove("homepage");
}
@@ -326,10 +320,9 @@ impl ValidatingArrayLoader {
"authors.{}.email : invalid value ({}), must be a valid email address",
key, email_str
));
- if let Some(PhpMixed::Array(authors)) =
- self.config.get_mut("authors").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(authors)) = self.config.get_mut("authors")
&& let Some(author_entry) = authors.get_mut(key)
- && let PhpMixed::Array(am) = author_entry.as_mut()
+ && let PhpMixed::Array(am) = author_entry
{
am.shift_remove("email");
}
@@ -343,8 +336,7 @@ impl ValidatingArrayLoader {
.map(|m| m.len())
.unwrap_or(0);
if current_author_len == 0
- && let Some(PhpMixed::Array(authors)) =
- self.config.get_mut("authors").map(|v| v.as_mut())
+ && let Some(PhpMixed::Array(authors)) = self.config.get_mut("authors")
{
authors.shift_remove(key);
}
@@ -378,9 +370,7 @@ impl ValidatingArrayLoader {
{
self.errors
.push(format!("support.{} : invalid value, must be a string", key));
- if let Some(PhpMixed::Array(support)) =
- self.config.get_mut("support").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(support)) = self.config.get_mut("support") {
support.shift_remove(key);
}
}
@@ -400,9 +390,7 @@ impl ValidatingArrayLoader {
"support.email : invalid value ({}), must be a valid email address",
email_str
));
- if let Some(PhpMixed::Array(support)) =
- self.config.get_mut("support").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(support)) = self.config.get_mut("support") {
support.shift_remove("email");
}
}
@@ -421,9 +409,7 @@ impl ValidatingArrayLoader {
"support.irc : invalid value ({}), must be a irc://<server>/<channel> or ircs:// URL",
irc_str
));
- if let Some(PhpMixed::Array(support)) =
- self.config.get_mut("support").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(support)) = self.config.get_mut("support") {
support.shift_remove("irc");
}
}
@@ -445,9 +431,7 @@ impl ValidatingArrayLoader {
"support.{} : invalid value ({}), must be an http/https URL",
key, url_str
));
- if let Some(PhpMixed::Array(support)) =
- self.config.get_mut("support").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(support)) = self.config.get_mut("support") {
support.shift_remove(key);
}
}
@@ -474,9 +458,7 @@ impl ValidatingArrayLoader {
key,
get_debug_type(&funding_option)
));
- if let Some(PhpMixed::Array(funding)) =
- self.config.get_mut("funding").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(funding)) = self.config.get_mut("funding") {
funding.shift_remove(key);
}
continue;
@@ -493,10 +475,9 @@ impl ValidatingArrayLoader {
"funding.{}.{} : invalid value, must be a string",
key, funding_data
));
- if let Some(PhpMixed::Array(funding)) =
- self.config.get_mut("funding").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(funding)) = self.config.get_mut("funding")
&& let Some(entry) = funding.get_mut(key)
- && let PhpMixed::Array(em) = entry.as_mut()
+ && let PhpMixed::Array(em) = entry
{
em.shift_remove(funding_data);
}
@@ -514,10 +495,9 @@ impl ValidatingArrayLoader {
"funding.{}.url : invalid value ({}), must be an http/https URL",
key, url_str
));
- if let Some(PhpMixed::Array(funding)) =
- self.config.get_mut("funding").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(funding)) = self.config.get_mut("funding")
&& let Some(entry) = funding.get_mut(key)
- && let PhpMixed::Array(em) = entry.as_mut()
+ && let PhpMixed::Array(em) = entry
{
em.shift_remove("url");
}
@@ -531,8 +511,7 @@ impl ValidatingArrayLoader {
.map(|m| m.is_empty())
.unwrap_or(true);
if entry_empty
- && let Some(PhpMixed::Array(funding)) =
- self.config.get_mut("funding").map(|v| v.as_mut())
+ && let Some(PhpMixed::Array(funding)) = self.config.get_mut("funding")
{
funding.shift_remove(key);
}
@@ -557,9 +536,9 @@ impl ValidatingArrayLoader {
}
if self.config.contains_key("php-ext") {
- let mut php_ext: IndexMap<String, Box<PhpMixed>> =
- match self.config.shift_remove("php-ext").unwrap().as_ref() {
- PhpMixed::Array(m) => m.clone(),
+ let mut php_ext: IndexMap<String, PhpMixed> =
+ match self.config.shift_remove("php-ext").unwrap() {
+ PhpMixed::Array(m) => m,
_ => IndexMap::new(),
};
@@ -605,7 +584,7 @@ impl ValidatingArrayLoader {
if let Some(v) = php_ext.get("build-path").cloned()
&& !is_string(&v)
- && !matches!(v.as_ref(), PhpMixed::Null)
+ && !matches!(v, PhpMixed::Null)
{
self.errors.push(format!(
"php-ext.build-path : should be a string or null, {} given",
@@ -628,7 +607,7 @@ impl ValidatingArrayLoader {
"pre-packaged-source",
"pre-packaged-binary",
];
- let defined_download_url_methods: IndexMap<String, Box<PhpMixed>> =
+ let defined_download_url_methods: IndexMap<String, PhpMixed> =
if is_array(&v) {
v.as_array().unwrap().clone()
} else {
@@ -709,7 +688,7 @@ impl ValidatingArrayLoader {
get_debug_type(&os_family)
));
if let Some(PhpMixed::Array(arr)) =
- php_ext.get_mut(field_name).map(|v| v.as_mut())
+ php_ext.get_mut(field_name)
{
arr.shift_remove(key);
}
@@ -724,7 +703,7 @@ impl ValidatingArrayLoader {
valid_os_families.join(", ")
));
if let Some(PhpMixed::Array(arr)) =
- php_ext.get_mut(field_name).map(|v| v.as_mut())
+ php_ext.get_mut(field_name)
{
arr.shift_remove(key);
}
@@ -767,7 +746,7 @@ impl ValidatingArrayLoader {
get_debug_type(&option)
));
if let Some(PhpMixed::Array(arr)) =
- php_ext.get_mut("configure-options").map(|v| v.as_mut())
+ php_ext.get_mut("configure-options")
{
arr.shift_remove(key);
}
@@ -781,7 +760,7 @@ impl ValidatingArrayLoader {
key
));
if let Some(PhpMixed::Array(arr)) =
- php_ext.get_mut("configure-options").map(|v| v.as_mut())
+ php_ext.get_mut("configure-options")
{
arr.shift_remove(key);
}
@@ -796,7 +775,7 @@ impl ValidatingArrayLoader {
get_debug_type(&name_val)
));
if let Some(PhpMixed::Array(arr)) =
- php_ext.get_mut("configure-options").map(|v| v.as_mut())
+ php_ext.get_mut("configure-options")
{
arr.shift_remove(key);
}
@@ -812,9 +791,9 @@ impl ValidatingArrayLoader {
get_debug_type(&needs_value)
));
if let Some(PhpMixed::Array(co)) =
- php_ext.get_mut("configure-options").map(|v| v.as_mut())
+ php_ext.get_mut("configure-options")
&& let Some(entry) = co.get_mut(key)
- && let PhpMixed::Array(em) = entry.as_mut()
+ && let PhpMixed::Array(em) = entry
{
em.shift_remove("needs-value");
}
@@ -829,9 +808,9 @@ impl ValidatingArrayLoader {
get_debug_type(&description)
));
if let Some(PhpMixed::Array(co)) =
- php_ext.get_mut("configure-options").map(|v| v.as_mut())
+ php_ext.get_mut("configure-options")
&& let Some(entry) = co.get_mut(key)
- && let PhpMixed::Array(em) = entry.as_mut()
+ && let PhpMixed::Array(em) = entry
{
em.shift_remove("description");
}
@@ -852,7 +831,7 @@ impl ValidatingArrayLoader {
// If php-ext is now empty, unset it
if !php_ext.is_empty() {
self.config
- .insert("php-ext".to_string(), Box::new(PhpMixed::Array(php_ext)));
+ .insert("php-ext".to_string(), PhpMixed::Array(php_ext));
}
}
}
@@ -876,9 +855,7 @@ impl ValidatingArrayLoader {
"{}.{} : a package cannot set a {} on itself",
link_type, package, link_type
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut(link_type).map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut(link_type) {
arr.shift_remove(&package);
}
continue;
@@ -896,29 +873,27 @@ impl ValidatingArrayLoader {
"{}.{} : invalid value, must be a string containing a version constraint",
link_type, package
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut(link_type).map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut(link_type) {
arr.shift_remove(&package);
}
} else if constraint.as_string().unwrap_or("") != "self.version" {
let constraint_str = constraint.as_string().unwrap_or("").to_string();
- let link_constraint =
- match self.version_parser.parse_constraints(&constraint_str) {
- Ok(c) => c,
- Err(e) => {
- self.errors.push(format!(
- "{}.{} : invalid version constraint ({})",
- link_type, package, e
- ));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut(link_type).map(|v| v.as_mut())
- {
- arr.shift_remove(&package);
- }
- continue;
+ let link_constraint = match self
+ .version_parser
+ .parse_constraints(&constraint_str)
+ {
+ Ok(c) => c,
+ Err(e) => {
+ self.errors.push(format!(
+ "{}.{} : invalid version constraint ({})",
+ link_type, package, e
+ ));
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut(link_type) {
+ arr.shift_remove(&package);
}
- };
+ continue;
+ }
+ };
// check requires for unbound constraints on non-platform packages
if (self.flags & Self::CHECK_UNBOUND_CONSTRAINTS) != 0
@@ -970,23 +945,15 @@ impl ValidatingArrayLoader {
.and_then(|v| v.as_array())
.cloned()
.unwrap_or_default();
- let replace_map_flat: IndexMap<String, PhpMixed> = replace_map
- .iter()
- .map(|(k, v)| (k.clone(), (**v).clone()))
- .collect();
- let conflict_map_flat: IndexMap<String, PhpMixed> = conflict_map
- .iter()
- .map(|(k, v)| (k.clone(), (**v).clone()))
- .collect();
+ let replace_map_flat: IndexMap<String, PhpMixed> = replace_map;
+ let conflict_map_flat: IndexMap<String, PhpMixed> = conflict_map;
let keys = array_intersect_key(&replace_map_flat, &conflict_map_flat);
if !keys.is_empty() {
self.errors.push(format!(
"{}.{} : you cannot conflict with a package that is also replaced, as replace already creates an implicit conflict rule",
link_type, package
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut(link_type).map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut(link_type) {
arr.shift_remove(&package);
}
}
@@ -1006,9 +973,7 @@ impl ValidatingArrayLoader {
"suggest.{} : invalid value, must be a string describing why the package is suggested",
package
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut("suggest").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut("suggest") {
arr.shift_remove(package);
}
}
@@ -1054,9 +1019,7 @@ impl ValidatingArrayLoader {
r#type,
types.join(", ")
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut("autoload").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut("autoload") {
arr.shift_remove(r#type);
}
}
@@ -1088,8 +1051,7 @@ impl ValidatingArrayLoader {
);
// Unset the psr-4 setting, since unsetting target-dir might
// interfere with other settings.
- if let Some(PhpMixed::Array(arr)) = self.config.get_mut("autoload").map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut("autoload") {
arr.shift_remove("psr-4");
}
}
@@ -1191,13 +1153,12 @@ impl ValidatingArrayLoader {
self.warnings.push(format!(
"extra.branch-alias.{} : the target branch ({}) must be a string, \"{}\" received.",
source_branch,
- json_encode(&**target_branch).unwrap_or_default(),
+ json_encode(target_branch).unwrap_or_default(),
get_debug_type(target_branch)
));
- if let Some(PhpMixed::Array(extra)) =
- self.config.get_mut("extra").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(extra)) = self.config.get_mut("extra")
&& let Some(ba) = extra.get_mut("branch-alias")
- && let PhpMixed::Array(bam) = ba.as_mut()
+ && let PhpMixed::Array(bam) = ba
{
bam.shift_remove(source_branch);
}
@@ -1212,10 +1173,9 @@ impl ValidatingArrayLoader {
"extra.branch-alias.{} : the target branch ({}) must end in -dev",
source_branch, target_branch_str
));
- if let Some(PhpMixed::Array(extra)) =
- self.config.get_mut("extra").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(extra)) = self.config.get_mut("extra")
&& let Some(ba) = extra.get_mut("branch-alias")
- && let PhpMixed::Array(bam) = ba.as_mut()
+ && let PhpMixed::Array(bam) = ba
{
bam.shift_remove(source_branch);
}
@@ -1234,10 +1194,9 @@ impl ValidatingArrayLoader {
"extra.branch-alias.{} : the target branch ({}) must be a parseable number like 2.0-dev",
source_branch, target_branch_str
));
- if let Some(PhpMixed::Array(extra)) =
- self.config.get_mut("extra").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(extra)) = self.config.get_mut("extra")
&& let Some(ba) = extra.get_mut("branch-alias")
- && let PhpMixed::Array(bam) = ba.as_mut()
+ && let PhpMixed::Array(bam) = ba
{
bam.shift_remove(source_branch);
}
@@ -1258,10 +1217,9 @@ impl ValidatingArrayLoader {
"extra.branch-alias.{} : the target branch ({}) is not a valid numeric alias for this version",
source_branch, target_branch_str
));
- if let Some(PhpMixed::Array(extra)) =
- self.config.get_mut("extra").map(|v| v.as_mut())
+ if let Some(PhpMixed::Array(extra)) = self.config.get_mut("extra")
&& let Some(ba) = extra.get_mut("branch-alias")
- && let PhpMixed::Array(bam) = ba.as_mut()
+ && let PhpMixed::Array(bam) = ba
{
bam.shift_remove(source_branch);
}
@@ -1274,17 +1232,14 @@ impl ValidatingArrayLoader {
return Err(anyhow::anyhow!(InvalidPackageException::new(
self.errors.clone(),
self.warnings.clone(),
- config
- .iter()
- .map(|(k, v)| (k.clone(), (**v).clone()))
- .collect(),
+ config.iter().map(|(k, v)| (k.clone(), v.clone())).collect(),
)));
}
let package = self.loader.load(
self.config
.iter()
- .map(|(k, v)| (k.clone(), (**v).clone()))
+ .map(|(k, v)| (k.clone(), v.clone()))
.collect(),
Some(class.to_string()),
)?;
@@ -1459,7 +1414,7 @@ impl ValidatingArrayLoader {
}
let mut pass = true;
- let entries: Vec<(String, Box<PhpMixed>)> = self.config[property]
+ let entries: Vec<(String, PhpMixed)> = self.config[property]
.as_array()
.map(|m| m.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
.unwrap_or_default();
@@ -1471,9 +1426,7 @@ impl ValidatingArrayLoader {
key,
get_debug_type(&value)
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut(property).map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut(property) {
arr.shift_remove(&key);
}
pass = false;
@@ -1488,9 +1441,7 @@ impl ValidatingArrayLoader {
"{}.{} : invalid value ({}), must match {}",
property, key, value_str, regex_str
));
- if let Some(PhpMixed::Array(arr)) =
- self.config.get_mut(property).map(|v| v.as_mut())
- {
+ if let Some(PhpMixed::Array(arr)) = self.config.get_mut(property) {
arr.shift_remove(&key);
}
pass = false;
@@ -1549,9 +1500,9 @@ impl ValidatingArrayLoader {
true
}
- fn is_empty_array(val: Option<&Box<PhpMixed>>) -> bool {
+ fn is_empty_array(val: Option<&PhpMixed>) -> bool {
match val {
- Some(v) => match v.as_ref() {
+ Some(v) => match v {
PhpMixed::Array(m) => m.is_empty(),
PhpMixed::Null => true,
PhpMixed::Bool(false) => true,
diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs
index 369433e..8910645 100644
--- a/crates/shirabe/src/package/locker.rs
+++ b/crates/shirabe/src/package/locker.rs
@@ -90,7 +90,7 @@ impl Locker {
pub fn get_content_hash(composer_file_contents: &str) -> Result<String> {
let content = JsonFile::parse_json(Some(composer_file_contents), Some("composer.json"))?;
let content_map: IndexMap<String, PhpMixed> = match &content {
- PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect(),
+ PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), v.clone())).collect(),
_ => IndexMap::new(),
};
@@ -124,7 +124,7 @@ impl Locker {
_ => None,
});
if let Some(platform) = platform_value {
- let mut config_map: IndexMap<String, Box<PhpMixed>> = IndexMap::new();
+ let mut config_map: IndexMap<String, PhpMixed> = IndexMap::new();
config_map.insert("platform".to_string(), platform);
relevant_content.insert("config".to_string(), PhpMixed::Array(config_map));
}
@@ -134,12 +134,7 @@ impl Locker {
Ok(hash(
"md5",
&JsonFile::encode_with_options(
- &PhpMixed::Array(
- relevant_content
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
- ),
+ &PhpMixed::Array(relevant_content.into_iter().collect()),
JsonEncodeOptions::none(),
),
))
@@ -162,7 +157,7 @@ impl Locker {
pub fn is_fresh(&mut self) -> Result<bool> {
let lock = self.lock_file.read()?;
let lock_map: IndexMap<String, PhpMixed> = match lock {
- PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(),
+ PhpMixed::Array(m) => m.into_iter().collect(),
_ => IndexMap::new(),
};
@@ -213,7 +208,7 @@ impl Locker {
let has_name = if let PhpMixed::List(list) = &locked_packages {
list.first()
- .map(|v| match v.as_ref() {
+ .map(|v| match v {
PhpMixed::Array(m) => m.contains_key("name"),
_ => false,
})
@@ -225,9 +220,9 @@ impl Locker {
let mut package_by_name: IndexMap<String, BasePackageHandle> = IndexMap::new();
if let PhpMixed::List(list) = locked_packages {
for info in list {
- if let PhpMixed::Array(m) = info.as_ref() {
+ if let PhpMixed::Array(m) = info {
let info_map: IndexMap<String, PhpMixed> =
- m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect();
+ m.iter().map(|(k, v)| (k.clone(), v.clone())).collect();
let package = self.loader.load(info_map, None)?;
packages.add_package(package.clone())?;
package_by_name.insert(package.get_name(), package.clone());
@@ -244,7 +239,7 @@ impl Locker {
&& let PhpMixed::List(alias_list) = aliases
{
for alias in alias_list {
- if let PhpMixed::Array(m) = alias.as_ref() {
+ if let PhpMixed::Array(m) = alias {
let alias_pkg_name = m
.get("package")
.and_then(|v| v.as_string())
@@ -290,7 +285,7 @@ impl Locker {
let lock_data = self.get_lock_data()?;
if let Some(PhpMixed::List(list)) = lock_data.get("packages-dev") {
for package in list {
- if let PhpMixed::Array(m) = package.as_ref() {
+ if let PhpMixed::Array(m) = package {
names.push(strtolower(
m.get("name").and_then(|v| v.as_string()).unwrap_or(""),
));
@@ -313,9 +308,7 @@ impl Locker {
"1.0.0",
Link::TYPE_REQUIRE,
match platform_value.unwrap() {
- PhpMixed::Array(m) => {
- m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()
- }
+ PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), v.clone())).collect(),
_ => IndexMap::new(),
},
)?;
@@ -331,9 +324,7 @@ impl Locker {
"1.0.0",
Link::TYPE_REQUIRE,
match platform_dev_value.unwrap() {
- PhpMixed::Array(m) => {
- m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()
- }
+ PhpMixed::Array(m) => m.iter().map(|(k, v)| (k.clone(), v.clone())).collect(),
_ => IndexMap::new(),
},
)?;
@@ -414,7 +405,7 @@ impl Locker {
.and_then(|v| match v {
PhpMixed::List(list) => Some(
list.iter()
- .filter_map(|v| match v.as_ref() {
+ .filter_map(|v| match v {
PhpMixed::Array(m) => Some(
m.iter()
.map(|(k, v)| {
@@ -457,7 +448,7 @@ impl Locker {
let data_php = self.lock_file.read()?;
let data: IndexMap<String, PhpMixed> = match data_php {
- PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(),
+ PhpMixed::Array(m) => m.into_iter().collect(),
_ => IndexMap::new(),
};
*self.lock_data_cache.borrow_mut() = Some(data.clone());
@@ -493,9 +484,9 @@ impl Locker {
if in_array(
PhpMixed::String(version),
&PhpMixed::List(vec![
- Box::new(PhpMixed::String("dev-master".to_string())),
- Box::new(PhpMixed::String("dev-trunk".to_string())),
- Box::new(PhpMixed::String("dev-default".to_string())),
+ PhpMixed::String("dev-master".to_string()),
+ PhpMixed::String("dev-trunk".to_string()),
+ PhpMixed::String("dev-default".to_string()),
]),
true,
) {
@@ -513,15 +504,15 @@ impl Locker {
lock.insert(
"_readme".to_string(),
PhpMixed::List(vec![
- Box::new(PhpMixed::String(
+ PhpMixed::String(
"This file locks the dependencies of your project to a known state".to_string(),
- )),
- Box::new(PhpMixed::String(
+ ),
+ PhpMixed::String(
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies".to_string(),
- )),
- Box::new(PhpMixed::String(
+ ),
+ PhpMixed::String(
format!("This file is @{}ated automatically", "gener"),
- )),
+ ),
]),
);
lock.insert(
@@ -536,11 +527,7 @@ impl Locker {
aliases
.iter()
.map(|m| {
- Box::new(PhpMixed::Array(
- m.iter()
- .map(|(k, v)| (k.clone(), Box::new(v.clone())))
- .collect(),
- ))
+ PhpMixed::Array(m.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
})
.collect(),
),
@@ -554,7 +541,7 @@ impl Locker {
PhpMixed::Array(
stability_flags
.iter()
- .map(|(k, v)| (k.clone(), Box::new(PhpMixed::Int(*v))))
+ .map(|(k, v)| (k.clone(), PhpMixed::Int(*v)))
.collect(),
),
);
@@ -573,7 +560,7 @@ impl Locker {
PhpMixed::Array(
platform_reqs
.iter()
- .map(|(k, v)| (k.clone(), Box::new(PhpMixed::String(v.clone()))))
+ .map(|(k, v)| (k.clone(), PhpMixed::String(v.clone())))
.collect(),
),
);
@@ -582,19 +569,14 @@ impl Locker {
PhpMixed::Array(
platform_dev_reqs
.iter()
- .map(|(k, v)| (k.clone(), Box::new(PhpMixed::String(v.clone()))))
+ .map(|(k, v)| (k.clone(), PhpMixed::String(v.clone())))
.collect(),
),
);
if !platform_overrides.is_empty() {
lock.insert(
"platform-overrides".to_string(),
- PhpMixed::Array(
- platform_overrides
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
- ),
+ PhpMixed::Array(platform_overrides.into_iter().collect()),
);
}
lock.insert(
@@ -625,21 +607,20 @@ impl Locker {
.unwrap_or(true);
if !is_locked || differs {
if write {
- self.lock_file.write(PhpMixed::Array(
- lock.into_iter().map(|(k, v)| (k, Box::new(v))).collect(),
- ))?;
+ self.lock_file
+ .write(PhpMixed::Array(lock.into_iter().collect()))?;
*self.lock_data_cache.borrow_mut() = None;
self.virtual_file_written = false;
} else {
self.virtual_file_written = true;
let parsed = JsonFile::parse_json(
Some(&JsonFile::encode(&PhpMixed::Array(
- lock.into_iter().map(|(k, v)| (k, Box::new(v))).collect(),
+ lock.into_iter().collect(),
))),
None,
)?;
let parsed_map: IndexMap<String, PhpMixed> = match parsed {
- PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(),
+ PhpMixed::Array(m) => m.into_iter().collect(),
_ => IndexMap::new(),
};
*self.lock_data_cache.borrow_mut() = Some(parsed_map);
@@ -682,7 +663,7 @@ impl Locker {
let lock_mtime = filemtime(self.lock_file.get_path());
let lock_data_php = self.lock_file.read()?;
let mut lock_data: IndexMap<String, PhpMixed> = match lock_data_php {
- PhpMixed::Array(m) => m.into_iter().map(|(k, v)| (k, *v)).collect(),
+ PhpMixed::Array(m) => m.into_iter().collect(),
_ => IndexMap::new(),
};
lock_data.insert(
@@ -694,10 +675,7 @@ impl Locker {
}
self.lock_file.write(PhpMixed::Array(
- self.fixup_json_data_type(lock_data)
- .into_iter()
- .map(|(k, v)| (k, Box::new(v)))
- .collect(),
+ self.fixup_json_data_type(lock_data).into_iter().collect(),
))?;
*self.lock_data_cache.borrow_mut() = None;
self.virtual_file_written = false;
@@ -729,9 +707,9 @@ impl Locker {
if let Some(PhpMixed::Array(m)) = lock_data.get_mut("stability-flags") {
let mut as_map: IndexMap<String, PhpMixed> =
- m.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect();
+ m.iter().map(|(k, v)| (k.clone(), v.clone())).collect();
ksort(&mut as_map);
- *m = as_map.into_iter().map(|(k, v)| (k, Box::new(v))).collect();
+ *m = as_map.into_iter().collect();
}
lock_data
@@ -804,11 +782,7 @@ impl Locker {
Ok(PhpMixed::List(
locked
.into_iter()
- .map(|m| {
- Box::new(PhpMixed::Array(
- m.into_iter().map(|(k, v)| (k, Box::new(v))).collect(),
- ))
- })
+ .map(|m| PhpMixed::Array(m.into_iter().collect()))
.collect(),
))
}
@@ -834,8 +808,8 @@ impl Locker {
&& in_array(
PhpMixed::String(source_type.clone().unwrap_or_default()),
&PhpMixed::List(vec![
- Box::new(PhpMixed::String("git".to_string())),
- Box::new(PhpMixed::String("hg".to_string())),
+ PhpMixed::String("git".to_string()),
+ PhpMixed::String("hg".to_string()),
]),
false,
)
@@ -859,12 +833,7 @@ impl Locker {
let command = GitUtil::build_rev_list_command(&self.process, args);
let mut output = PhpMixed::Null;
if 0 == self.process.borrow_mut().execute(
- PhpMixed::List(
- command
- .into_iter()
- .map(|s| Box::new(PhpMixed::String(s)))
- .collect(),
- ),
+ PhpMixed::List(command.into_iter().map(PhpMixed::String).collect()),
Some(&mut output),
path.as_deref(),
)? {
@@ -885,12 +854,12 @@ impl Locker {
let mut output = PhpMixed::Null;
if 0 == self.process.borrow_mut().execute(
PhpMixed::List(vec![
- Box::new(PhpMixed::String("hg".to_string())),
- Box::new(PhpMixed::String("log".to_string())),
- Box::new(PhpMixed::String("--template".to_string())),
- Box::new(PhpMixed::String("{date|hgdate}".to_string())),
- Box::new(PhpMixed::String("-r".to_string())),
- Box::new(PhpMixed::String(source_ref.clone())),
+ PhpMixed::String("hg".to_string()),
+ PhpMixed::String("log".to_string()),
+ PhpMixed::String("--template".to_string()),
+ PhpMixed::String("{date|hgdate}".to_string()),
+ PhpMixed::String("-r".to_string()),
+ PhpMixed::String(source_ref.clone()),
]),
Some(&mut output),
path.as_deref(),
diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index 5d41434..42646cb 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -283,14 +283,14 @@ impl VersionGuesser {
&self.process,
array_merge(
PhpMixed::List(vec![
- Box::new(PhpMixed::String("--format=%H".to_string())),
- Box::new(PhpMixed::String("-n1".to_string())),
- Box::new(PhpMixed::String("HEAD".to_string())),
+ PhpMixed::String("--format=%H".to_string()),
+ PhpMixed::String("-n1".to_string()),
+ PhpMixed::String("HEAD".to_string()),
]),
PhpMixed::List(
GitUtil::get_no_show_signature_flags(&self.process)
.into_iter()
- .map(|s| Box::new(PhpMixed::String(s)))
+ .map(PhpMixed::String)
.collect(),
),
)
@@ -474,7 +474,7 @@ impl VersionGuesser {
&json_encode(&PhpMixed::Array(
package_config
.iter()
- .map(|(k, v)| (k.clone(), Box::new(v.clone())))
+ .map(|(k, v)| (k.clone(), v.clone()))
.collect(),
))
.unwrap_or_default(),
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 04:06:59 +0000