mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reduce changes to the minimum necessary

Browse source
This commit is contained in:
Zanie 2024-01-26 14:43:23 -06:00
parent f7d285c895
commit 3e74c93bb7
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/pep508-rs/src/verbatim_url.rs
View file

@ -8,7 +8,7 @@ use regex::Regex;
use url::Url;
/// A wrapper around [`Url`] that preserves the original string.
#[derive(Debug, Clone, Eq, Ord, derivative::Derivative)]
#[derive(Debug, Clone, Eq, derivative::Derivative)]
#[derivative(PartialEq, PartialOrd, Hash)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct VerbatimUrl {

3
crates/puffin-resolver/src/error.rs
View file

@ -3,7 +3,6 @@ use std::convert::Infallible;
use std::fmt::Formatter;
use indexmap::IndexMap;
use itertools::Itertools;
use pubgrub::range::Range;
use pubgrub::report::{DefaultStringReporter, DerivationTree, Reporter};
use url::Url;
@ -171,7 +170,7 @@ impl NoSolutionError {
package_versions: &OnceMap<PackageName, VersionMap>,
) -> Self {
let mut available_versions = IndexMap::default();
for package in self.derivation_tree.packages().iter().sorted() {
for package in self.derivation_tree.packages() {
match package {
PubGrubPackage::Root(_) => {}
PubGrubPackage::Python(PubGrubPython::Installed) => {

2
crates/puffin-resolver/src/pubgrub/package.rs
View file

@ -10,7 +10,7 @@ use puffin_normalize::{ExtraName, PackageName};
/// 2. Uses the same strategy as pip and posy to handle extras: for each extra, we create a virtual
/// package (e.g., `black[colorama]`), and mark it as a dependency of the real package (e.g.,
/// `black`). We then discard the virtual packages at the end of the resolution process.
#[derive(Debug, Clone, Eq, Derivative, PartialOrd, Ord)]
#[derive(Debug, Clone, Eq, Derivative, PartialOrd)]
#[derivative(PartialEq, Hash)]
pub enum PubGrubPackage {
/// The root package, which is used to start the resolution process.