aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/self_update
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-20 01:16:50 +0900
committernsfisis <nsfisis@gmail.com>2026-06-20 02:22:41 +0900
commitefec43b3b8827820cf35fe1b73d8e33f5fe84eb4 (patch)
treea62bbba72324de48be5f8e689559f8d9e288fc61 /crates/shirabe/src/self_update
parentcac18ef73a39b4ac41fa4d6ccb753804d4c42cb7 (diff)
downloadphp-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.tar.gz
php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.tar.zst
php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.zip
refactor: auto-fix clippy warnings
Diffstat (limited to 'crates/shirabe/src/self_update')
-rw-r--r--crates/shirabe/src/self_update/versions.rs33
1 files changed, 16 insertions, 17 deletions
diff --git a/crates/shirabe/src/self_update/versions.rs b/crates/shirabe/src/self_update/versions.rs
index d854050..7c360e6 100644
--- a/crates/shirabe/src/self_update/versions.rs
+++ b/crates/shirabe/src/self_update/versions.rs
@@ -107,13 +107,13 @@ impl Versions {
};
std::fs::write(&channel_file, format!("{}{}", stored_channel, PHP_EOL))?;
- if let Some(io) = io {
- if previously_stored.as_deref() != Some(&stored_channel) {
- io.write_error(&format!(
+ if let Some(io) = io
+ && previously_stored.as_deref() != Some(&stored_channel)
+ {
+ io.write_error(&format!(
"Storing \"<info>{}</info>\" as default update channel for the next self-update run.",
stored_channel
));
- }
}
Ok(Ok(()))
@@ -129,19 +129,18 @@ impl Versions {
None => self.get_channel()?,
};
- if let PhpMixed::Array(ref map) = versions {
- if let Some(channel_versions) = map.get(&effective_channel) {
- if let PhpMixed::List(ref list) = **channel_versions {
- for version in list {
- if let PhpMixed::Array(ref v) = **version {
- let min_php = v.get("min-php").and_then(|p| p.as_int()).unwrap_or(0);
- if min_php <= PHP_VERSION_ID {
- return Ok(Ok(v
- .iter()
- .map(|(k, val)| (k.clone(), *val.clone()))
- .collect()));
- }
- }
+ if let PhpMixed::Array(ref map) = versions
+ && let Some(channel_versions) = map.get(&effective_channel)
+ && let PhpMixed::List(ref list) = **channel_versions
+ {
+ for version in list {
+ if let PhpMixed::Array(ref v) = **version {
+ let min_php = v.get("min-php").and_then(|p| p.as_int()).unwrap_or(0);
+ if min_php <= PHP_VERSION_ID {
+ return Ok(Ok(v
+ .iter()
+ .map(|(k, val)| (k.clone(), *val.clone()))
+ .collect()));
}
}
}