mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-24 21:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Deduplicate GitSha and GitOid types (#10802)

Browse source 
## Summary

I think this split is leftover from using `libgit2`. I kept `Oid` since
that seems to be the official terminology.
This commit is contained in:
Charlie Marsh 2025-01-21 09:15:11 -05:00 • committed by GitHub
parent 54bb5a38a4
commit 5c7fba86e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 66 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/uv-resolver/src/lock/mod.rs
View file

@ -31,7 +31,7 @@ use uv_distribution_types::{
RemoteSource, ResolvedDist, StaticMetadata, ToUrlError, UrlString,
};
use uv_fs::{relative_to, PortablePath, PortablePathBuf};
use uv_git::{GitReference, GitSha, RepositoryReference, ResolvedRepositoryReference};
use uv_git::{GitOid, GitReference, RepositoryReference, ResolvedRepositoryReference};
use uv_normalize::{ExtraName, GroupName, PackageName};
use uv_pep440::Version;
use uv_pep508::{split_scheme, MarkerEnvironment, MarkerTree, VerbatimUrl, VerbatimUrlError};
@ -3192,7 +3192,7 @@ struct DirectSource {
/// canonical ordering of package entries.
#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
struct GitSource {
precise: GitSha,
precise: GitOid,
subdirectory: Option<PathBuf>,
kind: GitSourceKind,
}
@ -3219,7 +3219,7 @@ impl GitSource {
_ => continue,
};
}
let precise = GitSha::from_str(url.fragment().ok_or(GitSourceError::MissingSha)?)
let precise = GitOid::from_str(url.fragment().ok_or(GitSourceError::MissingSha)?)
.map_err(|_| GitSourceError::InvalidSha)?;
Ok(GitSource {
@ -3587,7 +3587,7 @@ fn locked_git_url(git_dist: &GitSourceDist) -> Url {
.git
.precise()
.as_ref()
.map(GitSha::to_string)
.map(GitOid::to_string)
.as_deref(),
);