diff options
Diffstat (limited to 'crates/shirabe/src/command')
| -rw-r--r-- | crates/shirabe/src/command/archive_command.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/src/command/config_command.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/src/command/create_project_command.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/command/diagnose_command.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/command/init_command.rs | 7 | ||||
| -rw-r--r-- | crates/shirabe/src/command/package_discovery_trait.rs | 10 | ||||
| -rw-r--r-- | crates/shirabe/src/command/show_command.rs | 6 |
7 files changed, 23 insertions, 22 deletions
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 09066c9f..c2166b45 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -234,12 +234,12 @@ impl ArchiveCommand { { let m1 = matches .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let m0 = matches .get(&CaptureKey::ByIndex(0)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); min_stability = VersionParser::normalize_stability(&m1)?; let full_match_len = m0.len(); version = Some(version_str[..version_str.len() - full_match_len].to_string()); diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index 35cd2ab6..5022d09f 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -713,8 +713,8 @@ impl Command for ConfigCommand { } else { let repo_key = matches .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let repos = data.get("repositories").cloned(); value = match repos .as_ref() @@ -1401,7 +1401,7 @@ impl Command for ConfigCommand { .unwrap() .add_config_setting(&key, PhpMixed::Array(obj)); } else if matches!( - matches.get(&CaptureKey::ByIndex(1)).unwrap().as_str(), + matches.get(&CaptureKey::ByIndex(1)).unwrap(), "github-oauth" | "gitlab-oauth" | "gitlab-token" | "bearer" ) { if 1 != values.len() { diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index ae46da30..8d7b4072 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -543,8 +543,8 @@ impl CreateProjectCommand { stability = Some( matched .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(), + .unwrap_or_default() + .to_string(), ); } else { stability = Some(VersionParser::parse_stability( diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index ff9e0e63..448de89f 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -868,8 +868,8 @@ impl DiagnoseCommand { ) { let configure = phpinfo_match .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let configure = configure.as_str(); if configure.contains("--enable-sigchild") { diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index f9a504be..81e1e381 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -94,7 +94,9 @@ impl InitCommand { php_regex!(r#"/^(?P<name>[- .,\p{L}\p{N}\p{Mn}\'’\"()]+)(?:\s+<(?P<email>.+?)>)?$/u"#), author, ) { - let email = m.get(&CaptureKey::ByName("email".to_string())).cloned(); + let email = m + .get(&CaptureKey::ByName("email".to_string())) + .map(str::to_string); if let Some(ref email) = email && !self.is_valid_email(email) { @@ -107,8 +109,7 @@ impl InitCommand { result.insert( "name".to_string(), Some(trim( - &m.get(&CaptureKey::ByName("name".to_string())) - .cloned() + m.get(&CaptureKey::ByName("name".to_string())) .unwrap_or_default(), None, )), diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 4745a7d5..5b53bcbd 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -334,8 +334,9 @@ pub trait PackageDiscoveryTrait: BaseCommand { php_regex!(r"{^\s*(?P<name>[\S/]+)(?:\s+(?P<version>\S+))?\s*$}"), &selection, ) { - if let Some(v) = - m.get(&CaptureKey::ByName("version".to_string())).cloned() + if let Some(v) = m + .get(&CaptureKey::ByName("version".to_string())) + .map(str::to_string) { // parsing `acme/example ~2.3` // validate version constraint @@ -344,7 +345,6 @@ pub trait PackageDiscoveryTrait: BaseCommand { return Ok(PhpMixed::String(format!( "{} {}", m.get(&CaptureKey::ByName("name".to_string())) - .cloned() .unwrap_or_default(), v, ))); @@ -353,8 +353,8 @@ pub trait PackageDiscoveryTrait: BaseCommand { // parsing `acme/example` return Ok(PhpMixed::String( m.get(&CaptureKey::ByName("name".to_string())) - .cloned() - .unwrap_or_default(), + .unwrap_or_default() + .to_string(), )); } diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 419de424..b479c9a8 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -1380,12 +1380,12 @@ impl ShowCommand { { let zero_major = groups .get(&CaptureKey::ByName("zero_major".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let first_meaningful = groups .get(&CaptureKey::ByName("first_meaningful".to_string())) - .cloned() .unwrap_or_default() + .to_string() .parse::<i64>() .unwrap_or(0); target_version = Some(format!( |