From d96fabcb4ab3f0085e64b9da5082474043e77ab6 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Sat, 24 Feb 2024 14:04:54 -0500 Subject: [PATCH] cargo fmt --- crates/pep440-rs/src/version.rs | 20 +++++++++++++------ .../uv-resolver/src/pubgrub/dependencies.rs | 20 +++++++++---------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/crates/pep440-rs/src/version.rs b/crates/pep440-rs/src/version.rs index 4adcd446966c..2cc80b190953 100644 --- a/crates/pep440-rs/src/version.rs +++ b/crates/pep440-rs/src/version.rs @@ -386,6 +386,10 @@ impl Version { } /// Returns the min-release part of this version, if it exists. + /// + /// The "min" component is internal-only, and does not exist in PEP 440. + /// The version `1.0min0` is smaller than all other `1.0` versions, + /// like `1.0a1`, `1.0dev0`, etc. #[inline] pub fn min(&self) -> Option { match *self.inner { @@ -523,7 +527,9 @@ impl Version { /// Set the min-release component and return the updated version. /// - /// The min component is internal-only, and does not exist in PEP 440. + /// The "min" component is internal-only, and does not exist in PEP 440. + /// The version `1.0min0` is smaller than all other `1.0` versions, + /// like `1.0a1`, `1.0dev0`, etc. #[inline] pub fn with_min(mut self, value: Option) -> Version { if let VersionInner::Small { ref mut small } = Arc::make_mut(&mut self.inner) { @@ -1126,7 +1132,6 @@ struct VersionFull { /// release](https://peps.python.org/pep-0440/#developmental-releases), /// if any dev: Option, - /// An internal-only segment that does not exist in PEP 440, used to /// A [local version /// identifier](https://peps.python.org/pep-0440/#local-version-identif /// iers) such as `+deadbeef` in `1.2.3+deadbeef` @@ -1137,8 +1142,9 @@ struct VersionFull { /// > Local version labels have no specific semantics assigned, but /// > some syntactic restrictions are imposed. local: Vec, - /// represent the smallest possible version, preceding any `dev`, - /// `pre`, `post` or releases. + /// An internal-only segment that does not exist in PEP 440, used to + /// represent the smallest possible version of a release, preceding any + /// `dev`, `pre`, `post` or releases. min: Option, } @@ -2328,7 +2334,7 @@ fn sortable_tuple(version: &Version) -> (u64, u64, Option, u64, &[LocalSegm }), post, dev, - None + None, ) => (2, n, post, dev.unwrap_or(u64::MAX), version.local()), // beta release ( @@ -2353,7 +2359,9 @@ fn sortable_tuple(version: &Version) -> (u64, u64, Option, u64, &[LocalSegm // final release (None, None, None, None) => (5, 0, None, 0, version.local()), // post release - (None, Some(post), dev, None) => (6, 0, Some(post), dev.unwrap_or(u64::MAX), version.local()), + (None, Some(post), dev, None) => { + (6, 0, Some(post), dev.unwrap_or(u64::MAX), version.local()) + } } } diff --git a/crates/uv-resolver/src/pubgrub/dependencies.rs b/crates/uv-resolver/src/pubgrub/dependencies.rs index abb5938eb8b9..d024d3fcfa8b 100644 --- a/crates/uv-resolver/src/pubgrub/dependencies.rs +++ b/crates/uv-resolver/src/pubgrub/dependencies.rs @@ -9,10 +9,10 @@ use uv_normalize::{ExtraName, PackageName}; use crate::constraints::Constraints; use crate::overrides::Overrides; -use crate::pubgrub::PubGrubPackage; use crate::pubgrub::specifier::PubGrubSpecifier; -use crate::ResolveError; +use crate::pubgrub::PubGrubPackage; use crate::resolver::Urls; +use crate::ResolveError; #[derive(Debug)] pub struct PubGrubDependencies(Vec<(PubGrubPackage, Range)>); @@ -80,15 +80,13 @@ impl PubGrubDependencies { } // Add the package, plus any extra variants. - for result in std::iter::once(to_pubgrub(constraint, None, urls)) - .chain( - constraint - .extras - .clone() - .into_iter() - .map(|extra| to_pubgrub(constraint, Some(extra), urls)), - ) - { + for result in std::iter::once(to_pubgrub(constraint, None, urls)).chain( + constraint + .extras + .clone() + .into_iter() + .map(|extra| to_pubgrub(constraint, Some(extra), urls)), + ) { let (mut package, version) = result?; // Detect self-dependencies.