diff options
author | Matthias Beyer <matthias.beyer@atos.net> | 2021-03-18 08:57:02 +0100 |
---|---|---|
committer | Matthias Beyer <matthias.beyer@atos.net> | 2021-03-18 08:59:31 +0100 |
commit | 9870dd0967f33d9f8bf0279eaa03294da0b55148 (patch) | |
tree | fac285d2dd8b5116ead70e5c33bbe3d75e433b09 /src/commands/source.rs | |
parent | 13a85ddc5768a25f985eeb7b7dd1a8de5dce87d6 (diff) |
Rewrite PackageVersionConstraint constructing
Use the TryFrom trait rather than a `::new()` constructor that can fail.
This is way more idomatic.
Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
Diffstat (limited to 'src/commands/source.rs')
-rw-r--r-- | src/commands/source.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/commands/source.rs b/src/commands/source.rs index f29ce84..c3655cc 100644 --- a/src/commands/source.rs +++ b/src/commands/source.rs @@ -11,6 +11,7 @@ use std::io::Write; use std::path::PathBuf; use std::sync::Arc; +use std::convert::TryFrom; use anyhow::anyhow; use anyhow::Context; @@ -60,8 +61,7 @@ pub async fn verify( .map(PackageName::from); let pvers = matches .value_of("package_version") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose()?; let packages = repo @@ -183,8 +183,7 @@ pub async fn url(matches: &ArgMatches, repo: Repository) -> Result<()> { .map(PackageName::from); let pvers = matches .value_of("package_version") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose()?; repo.packages() @@ -225,8 +224,7 @@ pub async fn download( .map(PackageName::from); let pvers = matches .value_of("package_version") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose()?; let multi = { let mp = indicatif::MultiProgress::new(); |