Split version ranges into their own crate

Author: konstin

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - run: cargo build --verbose
-      - run: cargo test --features=serde --verbose
+      - run: cargo build --verbose --workspace
+      - run: cargo test --features serde --workspace --verbose
 
   clippy:
     name: No warnings from Clippy
@@ -30,7 +30,7 @@ jobs:
       - name: Check Clippy lints
         env:
           RUSTFLAGS: -D warnings
-        run: cargo clippy
+        run: cargo clippy --workspace
 
   check_formatting:
     name: Source code is formatted
@@ -40,7 +40,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
-      - run: cargo fmt --all -- --check
+      - run: cargo fmt --workspace -- --check
 
   check_documentation:
     name: Documentation builds successfully
@@ -51,4 +51,4 @@ jobs:
       - name: Check documentation
         env:
           RUSTDOCFLAGS: -D warnings
-        run: cargo doc --no-deps --document-private-items
+        run: cargo doc --workspace --no-deps --document-private-items

Cargo.lock

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: MPL-2.0
 
+[workspace]
+members = ["version-range"]
+
 [package]
 name = "pubgrub"
 version = "0.2.1"
@@ -21,18 +24,22 @@ include = ["Cargo.toml", "LICENSE", "README.md", "src/**", "tests/**", "examples
 
 [dependencies]
 indexmap = "2.5.0"
+log = "0.4.22" # for debug logs in tests
 priority-queue = "2.1.0"
-thiserror = "1.0"
 rustc-hash = ">=1.0.0, <3.0.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
-log = "0.4.22" # for debug logs in tests
+thiserror = "1.0"
+version-range = { version = "0.1.0", path = "version-range" }
 
 [dev-dependencies]
 proptest = "1.5.0"
-ron = "=0.9.0-alpha.0"
 varisat = "0.2.2"
 criterion = "0.5"
 env_logger = "0.11.5"
+version-range = { version = "0.1.0", path = "version-range", features = ["proptest"] }
+
+[features]
+serde = ["dep:serde", "version-range/serde"]
 
 [[bench]]
 name = "large_case"

Cargo.toml

@@ -212,7 +212,6 @@
 
 mod error;
 mod package;
-mod range;
 mod report;
 mod solver;
 mod term;
@@ -222,7 +221,6 @@ mod version_set;
 
 pub use error::{NoSolutionError, PubGrubError};
 pub use package::Package;
-pub use range::Range;
 pub use report::{
     DefaultStringReportFormatter, DefaultStringReporter, DerivationTree, Derived, External,
     ReportFormatter, Reporter,
@@ -231,6 +229,7 @@ pub use solver::{resolve, Dependencies, DependencyProvider, OfflineDependencyPro
 pub use term::Term;
 pub use type_aliases::{DependencyConstraints, Map, SelectedDependencies, Set};
 pub use version::{SemanticVersion, VersionParseError};
+pub use version_range::Range;
 pub use version_set::VersionSet;
 
 mod internal;

src/lib.rs

@@ -199,7 +199,7 @@ pub trait DependencyProvider {
     /// How this provider stores the version requirements for the packages.
     /// The requirements must be able to process the same kind of version as this dependency provider.
     ///
-    /// A common choice is [`Range`][crate::range::Range].
+    /// A common choice is [`Range`][version_range::Range].
     type VS: VersionSet<V = Self::V>;
 
     /// Type for custom incompatibilities.

src/solver.rs

@@ -220,15 +220,14 @@ impl<VS: VersionSet + Display> Display for Term<VS> {
 
 #[cfg(test)]
 pub mod tests {
-    use proptest::prelude::*;
-
     use super::*;
-    use crate::Range;
+    use proptest::prelude::*;
+    use version_range::Range;
 
     pub fn strategy() -> impl Strategy<Value = Term<Range<u32>>> {
         prop_oneof![
-            crate::range::tests::strategy().prop_map(Term::Positive),
-            crate::range::tests::strategy().prop_map(Term::Negative),
+            version_range::proptest_strategy().prop_map(Term::Negative),
+            version_range::proptest_strategy().prop_map(Term::Positive),
         ]
     }
     proptest! {

src/term.rs

@@ -20,6 +20,8 @@
 
 use std::fmt::{Debug, Display};
 
+use crate::Range;
+
 /// Trait describing sets of versions.
 pub trait VersionSet: Debug + Display + Clone + Eq {
     /// Version type associated with the sets manipulated.
@@ -68,3 +70,43 @@ pub trait VersionSet: Debug + Display + Clone + Eq {
         self == &self.intersection(other)
     }
 }
+
+impl<T: Debug + Display + Clone + Eq + Ord> VersionSet for Range<T> {
+    type V = T;
+
+    fn empty() -> Self {
+        Range::empty()
+    }
+
+    fn singleton(v: Self::V) -> Self {
+        Range::singleton(v)
+    }
+
+    fn complement(&self) -> Self {
+        Range::complement(self)
+    }
+
+    fn intersection(&self, other: &Self) -> Self {
+        Range::intersection(self, other)
+    }
+
+    fn contains(&self, v: &Self::V) -> bool {
+        Range::contains(self, v)
+    }
+
+    fn full() -> Self {
+        Range::full()
+    }
+
+    fn union(&self, other: &Self) -> Self {
+        Range::union(self, other)
+    }
+
+    fn is_disjoint(&self, other: &Self) -> bool {
+        Range::is_disjoint(self, other)
+    }
+
+    fn subset_of(&self, other: &Self) -> bool {
+        Range::subset_of(self, other)
+    }
+}

src/version_set.rs

@@ -0,0 +1,17 @@
+[package]
+name = "version-range"
+version = "0.1.0"
+edition = "2021"
+keywords = ["version", "pubgrub", "selector", "ranges"]
+
+[dependencies]
+proptest = { version = "1.5.0", optional = true }
+serde = { version = "1.0.210", features = ["derive"], optional = true }
+smallvec = { version = "1.13.2" }
+
+[features]
+serde = ["dep:serde", "smallvec/serde"]
+
+[dev-dependencies]
+proptest = "1.5.0"
+ron = "=0.9.0-alpha.0"