hide implementation detail, version_spec::Constraint (#341)

conda · Sep 16, 2023 · 8070e2e · 8070e2e
1 parent bfe5095
commit 8070e2e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/crates/rattler_conda_types/src/version_spec/constraint.rs b/crates/rattler_conda_types/src/version_spec/constraint.rs
@@ -8,7 +8,7 @@ use std::str::FromStr;
 /// A single version constraint (e.g. `>3.4.5` or `1.2.*`)
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub(crate) enum Constraint {
+pub enum Constraint {
     /// Matches anything (`*`)
     Any,
 

diff --git a/crates/rattler_conda_types/src/version_spec/mod.rs b/crates/rattler_conda_types/src/version_spec/mod.rs
@@ -7,7 +7,7 @@ pub(crate) mod version_tree;
 
 use crate::version_spec::version_tree::ParseVersionTreeError;
 use crate::{ParseVersionError, Version};
-pub(crate) use constraint::Constraint;
+use constraint::Constraint;
 use serde::{Deserialize, Serialize, Serializer};
 use std::convert::TryFrom;
 use std::fmt::{Display, Formatter};
@@ -17,7 +17,7 @@ use version_tree::VersionTree;
 
 use crate::version::StrictVersion;
 pub(crate) use constraint::is_start_of_version_constraint;
-pub(crate) use parse::ParseConstraintError;
+use parse::ParseConstraintError;
 
 /// An operator to compare two versions.
 #[allow(missing_docs)]
@@ -143,6 +143,19 @@ pub enum ParseVersionSpecError {
     InvalidConstraint(#[source] ParseConstraintError),
 }
 
+impl From<Constraint> for VersionSpec {
+    fn from(constraint: Constraint) -> Self {
+        match constraint {
+            Constraint::Any => VersionSpec::Any,
+            Constraint::Comparison(op, ver) => VersionSpec::Range(op, ver),
+            Constraint::StrictComparison(op, ver) => {
+                VersionSpec::StrictRange(op, StrictVersion(ver))
+            }
+            Constraint::Exact(e, ver) => VersionSpec::Exact(e, ver),
+        }
+    }
+}
+
 impl FromStr for VersionSpec {
     type Err = ParseVersionSpecError;
 
@@ -152,18 +165,9 @@ impl FromStr for VersionSpec {
 
         fn parse_tree(tree: VersionTree) -> Result<VersionSpec, ParseVersionSpecError> {
             match tree {
-                VersionTree::Term(str) => {
-                    let constraint = Constraint::from_str(str)
-                        .map_err(ParseVersionSpecError::InvalidConstraint)?;
-                    Ok(match constraint {
-                        Constraint::Any => VersionSpec::Any,
-                        Constraint::Comparison(op, ver) => VersionSpec::Range(op, ver),
-                        Constraint::StrictComparison(op, ver) => {
-                            VersionSpec::StrictRange(op, StrictVersion(ver))
-                        }
-                        Constraint::Exact(e, ver) => VersionSpec::Exact(e, ver),
-                    })
-                }
+                VersionTree::Term(str) => Ok(Constraint::from_str(str)
+                    .map_err(ParseVersionSpecError::InvalidConstraint)?
+                    .into()),
                 VersionTree::Group(op, groups) => Ok(VersionSpec::Group(
                     op,
                     groups

diff --git a/crates/rattler_conda_types/src/version_spec/parse.rs b/crates/rattler_conda_types/src/version_spec/parse.rs
@@ -189,7 +189,7 @@ fn logical_constraint_parser(input: &str) -> IResult<&str, Constraint, ParseCons
 }
 
 /// Parses a version constraint.
-pub(crate) fn constraint_parser(input: &str) -> IResult<&str, Constraint, ParseConstraintError> {
+pub fn constraint_parser(input: &str) -> IResult<&str, Constraint, ParseConstraintError> {
     alt((
         regex_constraint_parser,
         any_constraint_parser,