mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-12-02 08:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove PubGrubVersion (#924)

Browse source 
## Summary

I'm running into some annoyances converting `&Version` to
`&PubGrubVersion` (which is just a wrapper type around `Version`), and I
realized... We don't even need `PubGrubVersion`?

The reason we "need" it today is due to the orphan trait rule: `Version`
is defined in `pep440_rs`, but we want to `impl
pubgrub::version::Version for Version` in the resolver crate.

Instead of introducing a new type here, which leads to a lot of
awkwardness around conversion and API isolation, what if we instead just
implement `pubgrub::version::Version` in `pep440_rs` via a feature? That
way, we can just use `Version` everywhere without any confusion and
conversion for the wrapper type.
This commit is contained in:
Charlie Marsh 2024-01-15 08:51:12 -05:00 • committed by GitHub
parent 8860a9c29e
commit 9a3f3d385c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 179 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/puffin-client/src/flat_index.rs
View file

@ -13,18 +13,10 @@ use pep440_rs::Version;
use platform_tags::Tags;
use puffin_normalize::PackageName;
#[derive(Debug, Clone)]
pub struct FlatIndex<T: Into<Version> + From<Version> + Ord>(
pub BTreeMap<T, PrioritizedDistribution>,
);
#[derive(Debug, Clone, Default)]
pub struct FlatIndex(pub BTreeMap<Version, PrioritizedDistribution>);
impl<T: Into<Version> + From<Version> + Ord> Default for FlatIndex<T> {
fn default() -> Self {
Self(BTreeMap::default())
}
}
impl<T: Into<Version> + From<Version> + Ord> FlatIndex<T> {
impl FlatIndex {
/// Collect all the files from `--find-links` into a override hashmap we can pass into version map creation.
#[instrument(skip_all)]
pub fn from_files(
@ -44,7 +36,7 @@ impl<T: Into<Version> + From<Version> + Ord> FlatIndex<T> {
}
fn add_file(
version_map: &mut FlatIndex<T>,
version_map: &mut FlatIndex,
file: File,
filename: DistFilename,
tags: &Tags,
@ -62,7 +54,7 @@ impl<T: Into<Version> + From<Version> + Ord> FlatIndex<T> {
file,
index,
}));
match version_map.0.entry(version.into()) {
match version_map.0.entry(version) {
Entry::Occupied(mut entry) => {
entry.get_mut().insert_built(dist, None, None, priority);
}
@ -79,7 +71,7 @@ impl<T: Into<Version> + From<Version> + Ord> FlatIndex<T> {
file,
index,
}));
match version_map.0.entry(filename.version.clone().into()) {
match version_map.0.entry(filename.version.clone()) {
Entry::Occupied(mut entry) => {
entry.get_mut().insert_source(dist, None, None);
}
@ -91,7 +83,7 @@ impl<T: Into<Version> + From<Version> + Ord> FlatIndex<T> {
}
}
pub fn iter(&self) -> impl Iterator<Item = (&T, &PrioritizedDistribution)> {
pub fn iter(&self) -> impl Iterator<Item = (&Version, &PrioritizedDistribution)> {
self.0.iter()
}
}