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 | |
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')
-rw-r--r-- | src/commands/env_of.rs | 5 | ||||
-rw-r--r-- | src/commands/find_artifact.rs | 4 | ||||
-rw-r--r-- | src/commands/find_pkg.rs | 5 | ||||
-rw-r--r-- | src/commands/lint.rs | 4 | ||||
-rw-r--r-- | src/commands/source.rs | 10 | ||||
-rw-r--r-- | src/commands/tree_of.rs | 5 |
6 files changed, 17 insertions, 16 deletions
diff --git a/src/commands/env_of.rs b/src/commands/env_of.rs index 4ee48d1..c763a23 100644 --- a/src/commands/env_of.rs +++ b/src/commands/env_of.rs @@ -8,6 +8,8 @@ // SPDX-License-Identifier: EPL-2.0 // +use std::convert::TryFrom; + use anyhow::Result; use clap::ArgMatches; use log::trace; @@ -29,8 +31,7 @@ pub async fn env_of(matches: &ArgMatches, repo: Repository) -> Result<()> { .unwrap(); let constraint = matches .value_of("package_version_constraint") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .unwrap()?; trace!( "Checking for package with name = {} and version = {:?}", diff --git a/src/commands/find_artifact.rs b/src/commands/find_artifact.rs index ee11229..17db563 100644 --- a/src/commands/find_artifact.rs +++ b/src/commands/find_artifact.rs @@ -11,6 +11,7 @@ use std::path::PathBuf; use std::io::Write; use std::sync::Arc; +use std::convert::TryFrom; use anyhow::Context; use anyhow::Error; @@ -37,8 +38,7 @@ pub async fn find_artifact(matches: &ArgMatches, config: &Configuration, progres let package_version_constraint = matches .value_of("package_version_constraint") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose() .context("Parsing package version constraint") .context("A valid package version constraint looks like this: '=1.0.0'")?; diff --git a/src/commands/find_pkg.rs b/src/commands/find_pkg.rs index e2f7b77..7190ef8 100644 --- a/src/commands/find_pkg.rs +++ b/src/commands/find_pkg.rs @@ -8,6 +8,8 @@ // SPDX-License-Identifier: EPL-2.0 // +use std::convert::TryFrom; + use anyhow::Context; use anyhow::Result; use clap::ArgMatches; @@ -31,8 +33,7 @@ pub async fn find_pkg( let package_version_constraint = matches .value_of("package_version_constraint") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose() .context("Parsing package version constraint") .context("A valid package version constraint looks like this: '=1.0.0'")?; diff --git a/src/commands/lint.rs b/src/commands/lint.rs index 9ad9c7d..2a54c62 100644 --- a/src/commands/lint.rs +++ b/src/commands/lint.rs @@ -8,6 +8,7 @@ // SPDX-License-Identifier: EPL-2.0 // +use std::convert::TryFrom; use std::path::Path; use anyhow::anyhow; @@ -36,8 +37,7 @@ pub async fn lint( .map(PackageName::from); let pvers = matches .value_of("package_version") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose()?; let bar = progressbars.bar(); 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(); diff --git a/src/commands/tree_of.rs b/src/commands/tree_of.rs index 30196b7..10e51d3 100644 --- a/src/commands/tree_of.rs +++ b/src/commands/tree_of.rs @@ -8,6 +8,8 @@ // SPDX-License-Identifier: EPL-2.0 // +use std::convert::TryFrom; + use anyhow::Error; use anyhow::Result; use clap::ArgMatches; @@ -31,8 +33,7 @@ pub async fn tree_of( .map(PackageName::from); let pvers = matches .value_of("package_version") - .map(String::from) - .map(PackageVersionConstraint::new) + .map(PackageVersionConstraint::try_from) .transpose()?; repo.packages() |