mordernize the variant wheel filename formatting and rustfmt

This commit is contained in:
konstin 2025-07-02 22:11:50 +02:00
parent 2eca43f406
commit fd2e13ce4d
4 changed files with 11 additions and 12 deletions

View file

@ -35,8 +35,8 @@ use uv_variants::VariantTag;
pub struct WheelFilename {
pub name: PackageName,
pub version: Version,
variant: Option<VariantTag>,
tags: WheelTag,
variant: Option<VariantTag>,
}
impl FromStr for WheelFilename {
@ -58,11 +58,11 @@ impl Display for WheelFilename {
if let Some(variant) = &self.variant {
write!(
f,
"{}-{}-~{}~-{}.whl",
"{}-{}-{}-{}.whl",
self.name.as_dist_info_name(),
self.version,
variant,
self.tags
variant,
)
} else {
write!(

View file

@ -5,8 +5,8 @@ use std::sync::Arc;
use itertools::Itertools;
use sha3::{
digest::{ExtendableOutput, Update},
Shake128,
digest::{ExtendableOutput, Update},
};
#[derive(

View file

@ -37,7 +37,7 @@ use uv_resolver::{
};
use uv_torch::{TorchMode, TorchStrategy};
use uv_types::{BuildIsolation, HashStrategy};
use uv_variants::{get_combinations, VariantSet};
use uv_variants::{VariantSet, get_combinations};
use uv_warnings::warn_user;
use uv_workspace::WorkspaceCache;
@ -464,7 +464,6 @@ pub(crate) async fn pip_install(
VariantSet::new(&combinations)?
};
let options = OptionsBuilder::new()
.resolution_mode(resolution_mode)
.prerelease_mode(prerelease_mode)
@ -492,9 +491,9 @@ pub(crate) async fn pip_install(
&upgrade,
Some(&tags),
Some(&variants),
ResolverEnvironment::specific(marker_env.clone()),
python_requirement,
interpreter.markers(),
ResolverEnvironment::specific(marker_env.clone()),
python_requirement,
interpreter.markers(),
Conflicts::empty(),
&client,
&flat_index,

View file

@ -408,9 +408,9 @@ pub(crate) async fn pip_sync(
&upgrade,
Some(&tags),
variants,
ResolverEnvironment::specific(marker_env.clone()),
python_requirement,
interpreter.markers(),
ResolverEnvironment::specific(marker_env.clone()),
python_requirement,
interpreter.markers(),
Conflicts::empty(),
&client,
&flat_index,