Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `FxHashMap` for available versions (#4278) 

## Summary

I don't think we ever iterate over these in-order so I'd rather use
`FxHash` to avoid creating the appearance that the order matters.
This commit is contained in:
Charlie Marsh 2024-06-12 10:16:37 -07:00 committed by GitHub
parent 44f1afd6b0
commit baee826517
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/uv-resolver/src/error.rs
View File

@ -3,7 +3,6 @@ use std::fmt::Formatter;
use std::sync::Arc; use std::sync::Arc;
use dashmap::DashMap; use dashmap::DashMap;
use indexmap::IndexMap;
use pubgrub::range::Range; use pubgrub::range::Range;
use pubgrub::report::{DefaultStringReporter, DerivationTree, External, Reporter}; use pubgrub::report::{DefaultStringReporter, DerivationTree, External, Reporter};
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
@ -173,7 +172,7 @@ impl From<pubgrub::error::PubGrubError<UvDependencyProvider>> for ResolveError {
Self::NoSolution(NoSolutionError { Self::NoSolution(NoSolutionError {
derivation_tree, derivation_tree,
// The following should be populated before display for the best error messages // The following should be populated before display for the best error messages
available_versions: IndexMap::default(), available_versions: FxHashMap::default(),
selector: None, selector: None,
python_requirement: None, python_requirement: None,
index_locations: None, index_locations: None,
@ -195,7 +194,7 @@ impl From<pubgrub::error::PubGrubError<UvDependencyProvider>> for ResolveError {
#[derive(Debug)] #[derive(Debug)]
pub struct NoSolutionError { pub struct NoSolutionError {
derivation_tree: DerivationTree<PubGrubPackage, Range<Version>, UnavailableReason>, derivation_tree: DerivationTree<PubGrubPackage, Range<Version>, UnavailableReason>,
available_versions: IndexMap<PubGrubPackage, BTreeSet<Version>>, available_versions: FxHashMap<PubGrubPackage, BTreeSet<Version>>,
selector: Option<CandidateSelector>, selector: Option<CandidateSelector>,
python_requirement: Option<PythonRequirement>, python_requirement: Option<PythonRequirement>,
index_locations: Option<IndexLocations>, index_locations: Option<IndexLocations>,
@ -241,7 +240,7 @@ impl NoSolutionError {
visited: &FxHashSet<PackageName>, visited: &FxHashSet<PackageName>,
package_versions: &FxOnceMap<PackageName, Arc<VersionsResponse>>, package_versions: &FxOnceMap<PackageName, Arc<VersionsResponse>>,
) -> Self { ) -> Self {
let mut available_versions = IndexMap::default(); let mut available_versions = FxHashMap::default();
for package in self.derivation_tree.packages() { for package in self.derivation_tree.packages() {
match &**package { match &**package {
PubGrubPackageInner::Root { .. } => {} PubGrubPackageInner::Root { .. } => {}

4
crates/uv-resolver/src/pubgrub/report.rs
View File

@ -4,7 +4,7 @@ use std::collections::{BTreeMap, BTreeSet};
use std::ops::Bound; use std::ops::Bound;
use derivative::Derivative; use derivative::Derivative;
use indexmap::{IndexMap, IndexSet}; use indexmap::IndexSet;
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use pubgrub::range::Range; use pubgrub::range::Range;
use pubgrub::report::{DerivationTree, Derived, External, ReportFormatter}; use pubgrub::report::{DerivationTree, Derived, External, ReportFormatter};
@ -26,7 +26,7 @@ use super::{PubGrubPackage, PubGrubPackageInner, PubGrubPython};
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct PubGrubReportFormatter<'a> { pub(crate) struct PubGrubReportFormatter<'a> {
/// The versions that were available for each package /// The versions that were available for each package
pub(crate) available_versions: &'a IndexMap<PubGrubPackage, BTreeSet<Version>>, pub(crate) available_versions: &'a FxHashMap<PubGrubPackage, BTreeSet<Version>>,
/// The versions that were available for each package /// The versions that were available for each package
pub(crate) python_requirement: Option<&'a PythonRequirement>, pub(crate) python_requirement: Option<&'a PythonRequirement>,