aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/repository
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/repository')
-rw-r--r--crates/shirabe/src/repository/vcs/github_driver.rs3
-rw-r--r--crates/shirabe/src/repository/vcs/svn_driver.rs11
2 files changed, 4 insertions, 10 deletions
diff --git a/crates/shirabe/src/repository/vcs/github_driver.rs b/crates/shirabe/src/repository/vcs/github_driver.rs
index 94daf05c..c7fe5266 100644
--- a/crates/shirabe/src/repository/vcs/github_driver.rs
+++ b/crates/shirabe/src/repository/vcs/github_driver.rs
@@ -160,8 +160,7 @@ impl GitHubDriver {
.inner
.repo_config
.get("no-api")
- .and_then(|v| v.as_bool())
- == Some(true)
+ .is_some_and(|v| v.to_bool())
{
self.setup_git_driver(&self.inner.url.clone())?;
diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs
index 5f1faa65..ecf4a48a 100644
--- a/crates/shirabe/src/repository/vcs/svn_driver.rs
+++ b/crates/shirabe/src/repository/vcs/svn_driver.rs
@@ -15,7 +15,7 @@ use chrono::{DateTime, FixedOffset, Utc};
use indexmap::IndexMap;
use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
- PhpMixed, RuntimeException, array_key_exists, php_regex, stripos, strrpos, strtr, substr, trim,
+ PhpMixed, RuntimeException, php_regex, stripos, strrpos, strtr, substr, trim,
};
#[derive(Debug)]
@@ -85,13 +85,8 @@ impl SvnDriver {
if let Some(PhpMixed::String(v)) = self.inner.repo_config.get("tags-path").cloned() {
self.tags_path = v;
}
- if array_key_exists("svn-cache-credentials", &self.inner.repo_config) {
- self.cache_credentials = self
- .inner
- .repo_config
- .get("svn-cache-credentials")
- .and_then(|v| v.as_bool())
- .unwrap_or(false);
+ if let Some(v) = self.inner.repo_config.get("svn-cache-credentials") {
+ self.cache_credentials = v.to_bool();
}
if let Some(PhpMixed::String(v)) = self.inner.repo_config.get("package-path").cloned() {
self.package_path = format!("/{}", trim(&v, Some("/")));