mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-19 03:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename ancillary direct url types to parsed url (#3211)

Browse source 
Followup to #3187. Renaming only
This commit is contained in:
konsti 2024-04-23 16:51:23 +02:00 • committed by GitHub
parent 645d0399fd
commit 4a49ff4372
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 54 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/uv-distribution/src/error.rs
View file

@ -3,7 +3,7 @@ use tokio::task::JoinError;
use zip::result::ZipError;
use distribution_filename::WheelFilenameError;
use distribution_types::DirectUrlError;
use distribution_types::ParsedUrlError;
use pep440_rs::Version;
use pypi_types::HashDigest;
use uv_client::BetterReqwestError;
@ -24,7 +24,7 @@ pub enum Error {
#[error("Git operation failed")]
Git(#[source] anyhow::Error),
#[error(transparent)]
DirectUrl(#[from] Box<DirectUrlError>),
DirectUrl(#[from] Box<ParsedUrlError>),
#[error(transparent)]
Reqwest(#[from] BetterReqwestError),
#[error(transparent)]

18
crates/uv-distribution/src/git.rs
View file

@ -9,7 +9,7 @@ use tracing::debug;
use url::Url;
use cache_key::{CanonicalUrl, RepositoryUrl};
use distribution_types::DirectGitUrl;
use distribution_types::ParsedGitUrl;
use uv_cache::{Cache, CacheBucket};
use uv_fs::LockedFile;
use uv_git::{Fetch, GitReference, GitSha, GitSource, GitUrl};
@ -67,7 +67,7 @@ pub(crate) async fn fetch_git_archive(
)
.map_err(Error::CacheWrite)?;
let DirectGitUrl { url, subdirectory } = DirectGitUrl::try_from(url).map_err(Box::new)?;
let ParsedGitUrl { url, subdirectory } = ParsedGitUrl::try_from(url).map_err(Box::new)?;
// Fetch the Git repository.
let source = if let Some(reporter) = reporter {
@ -95,7 +95,7 @@ pub(crate) async fn resolve_precise(
cache: &Cache,
reporter: Option<&Arc<dyn Reporter>>,
) -> Result<Option<Url>, Error> {
let DirectGitUrl { url, subdirectory } = DirectGitUrl::try_from(url).map_err(Box::new)?;
let ParsedGitUrl { url, subdirectory } = ParsedGitUrl::try_from(url).map_err(Box::new)?;
// If the Git reference already contains a complete SHA, short-circuit.
if url.precise().is_some() {
@ -107,7 +107,7 @@ pub(crate) async fn resolve_precise(
let resolved_git_refs = RESOLVED_GIT_REFS.lock().unwrap();
let reference = RepositoryReference::new(&url);
if let Some(precise) = resolved_git_refs.get(&reference) {
return Ok(Some(Url::from(DirectGitUrl {
return Ok(Some(Url::from(ParsedGitUrl {
url: url.with_precise(*precise),
subdirectory,
})));
@ -136,7 +136,7 @@ pub(crate) async fn resolve_precise(
}
// Re-encode as a URL.
Ok(Some(Url::from(DirectGitUrl {
Ok(Some(Url::from(ParsedGitUrl {
url: git,
subdirectory,
})))
@ -154,11 +154,11 @@ pub(crate) async fn resolve_precise(
/// This method will only return precise URLs for URLs that have already been resolved via
/// [`resolve_precise`].
pub fn to_precise(url: &Url) -> Option<Url> {
let DirectGitUrl { url, subdirectory } = DirectGitUrl::try_from(url).ok()?;
let ParsedGitUrl { url, subdirectory } = ParsedGitUrl::try_from(url).ok()?;
let resolved_git_refs = RESOLVED_GIT_REFS.lock().unwrap();
let reference = RepositoryReference::new(&url);
let precise = resolved_git_refs.get(&reference)?;
Some(Url::from(DirectGitUrl {
Some(Url::from(ParsedGitUrl {
url: url.with_precise(*precise),
subdirectory,
}))
@ -182,12 +182,12 @@ fn is_same_reference_impl<'a>(
resolved_refs: &FxHashMap<RepositoryReference, GitSha>,
) -> bool {
// Convert `a` to a Git URL, if possible.
let Ok(a_git) = DirectGitUrl::try_from(&Url::from(CanonicalUrl::new(a))) else {
let Ok(a_git) = ParsedGitUrl::try_from(&Url::from(CanonicalUrl::new(a))) else {
return false;
};
// Convert `b` to a Git URL, if possible.
let Ok(b_git) = DirectGitUrl::try_from(&Url::from(CanonicalUrl::new(b))) else {
let Ok(b_git) = ParsedGitUrl::try_from(&Url::from(CanonicalUrl::new(b))) else {
return false;
};

12
crates/uv-distribution/src/source/mod.rs
View file

@ -16,8 +16,8 @@ use zip::ZipArchive;
use distribution_filename::WheelFilename;
use distribution_types::{
BuildableSource, DirectArchiveUrl, Dist, FileLocation, GitSourceUrl, HashPolicy, Hashed,
LocalEditable, PathSourceDist, PathSourceUrl, RemoteSource, SourceDist, SourceUrl,
BuildableSource, Dist, FileLocation, GitSourceUrl, HashPolicy, Hashed, LocalEditable,
ParsedArchiveUrl, PathSourceDist, PathSourceUrl, RemoteSource, SourceDist, SourceUrl,
};
use install_wheel_rs::metadata::read_archive_metadata;
use platform_tags::Tags;
@ -135,7 +135,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
}
BuildableSource::Dist(SourceDist::DirectUrl(dist)) => {
let filename = dist.filename().expect("Distribution must have a filename");
let DirectArchiveUrl { url, subdirectory } = DirectArchiveUrl::from(dist.url.raw());
let ParsedArchiveUrl { url, subdirectory } = ParsedArchiveUrl::from(dist.url.raw());
// For direct URLs, cache directly under the hash of the URL itself.
let cache_shard = self
@ -186,7 +186,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
.url
.filename()
.expect("Distribution must have a filename");
let DirectArchiveUrl { url, subdirectory } = DirectArchiveUrl::from(resource.url);
let ParsedArchiveUrl { url, subdirectory } = ParsedArchiveUrl::from(resource.url);
// For direct URLs, cache directly under the hash of the URL itself.
let cache_shard = self
@ -284,7 +284,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
}
BuildableSource::Dist(SourceDist::DirectUrl(dist)) => {
let filename = dist.filename().expect("Distribution must have a filename");
let DirectArchiveUrl { url, subdirectory } = DirectArchiveUrl::from(dist.url.raw());
let ParsedArchiveUrl { url, subdirectory } = ParsedArchiveUrl::from(dist.url.raw());
// For direct URLs, cache directly under the hash of the URL itself.
let cache_shard = self
@ -328,7 +328,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
.url
.filename()
.expect("Distribution must have a filename");
let DirectArchiveUrl { url, subdirectory } = DirectArchiveUrl::from(resource.url);
let ParsedArchiveUrl { url, subdirectory } = ParsedArchiveUrl::from(resource.url);
// For direct URLs, cache directly under the hash of the URL itself.
let cache_shard = self