refactor: Move VersionRange parsing to CLI

src/cli.rs

@@ -11,7 +11,7 @@ use lexopt::{
     ValueExt,
 };
 
-use crate::{term, Feature, Rustup};
+use crate::{term, version::VersionRange, Feature, Rustup};
 
 pub(crate) struct Args {
     pub(crate) leading_args: Vec<String>,
@@ -52,7 +52,7 @@ pub(crate) struct Args {
     /// --print-command-list
     pub(crate) print_command_list: bool,
     /// --version-range
-    pub(crate) version_range: Option<String>,
+    pub(crate) version_range: Option<VersionRange>,
     /// --version-step
     pub(crate) version_step: Option<String>,
 
@@ -520,6 +520,7 @@ impl Args {
                 requires("--clean-per-version", &["--version-range"])?;
             }
         }
+        let version_range = version_range.map(|v| v.parse()).transpose()?;
 
         if no_dev_deps {
             info!(

src/context.rs

@@ -79,7 +79,6 @@ impl Context {
         this.version_range = this
             .args
             .version_range
-            .as_ref()
             .map(|range| rustup::version_range(range, this.args.version_step.as_deref(), &this))
             .transpose()?;
 

src/rustup.rs

@@ -24,7 +24,7 @@ impl Rustup {
 }
 
 pub(crate) fn version_range(
-    range: &str,
+    range: VersionRange,
     step: Option<&str>,
     cx: &Context,
 ) -> Result<Vec<(u32, String)>> {
@@ -41,7 +41,7 @@ pub(crate) fn version_range(
         Ok(())
     };
 
-    let VersionRange { start_inclusive, end_inclusive } = range.parse()?;
+    let VersionRange { start_inclusive, end_inclusive } = range;
 
     let start_inclusive = match start_inclusive {
         Some(start) => start,

src/version.rs

@@ -1,13 +1,26 @@
-use std::str::FromStr;
+use std::{fmt, str::FromStr};
 
 use anyhow::{Context as _, Error, Result};
 
+#[derive(Copy, Clone)]
 pub(crate) struct Version {
     pub(crate) major: u32,
     pub(crate) minor: u32,
     pub(crate) patch: Option<u32>,
 }
 
+impl fmt::Display for Version {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let major = self.major;
+        let minor = self.minor;
+        write!(f, "{major}.{minor}")?;
+        if let Some(patch) = self.patch {
+            write!(f, ".{patch}")?;
+        }
+        Ok(())
+    }
+}
+
 impl FromStr for Version {
     type Err = Error;
 
@@ -20,11 +33,25 @@ impl FromStr for Version {
     }
 }
 
+#[derive(Copy, Clone)]
 pub(crate) struct VersionRange {
     pub(crate) start_inclusive: Option<Version>,
     pub(crate) end_inclusive: Option<Version>,
 }
 
+impl fmt::Display for VersionRange {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if let Some(start) = self.start_inclusive {
+            write!(f, "{start}")?;
+        }
+        write!(f, "..")?;
+        if let Some(end) = self.end_inclusive {
+            write!(f, "{end}")?;
+        }
+        Ok(())
+    }
+}
+
 impl FromStr for VersionRange {
     type Err = Error;