mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 13:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

uv-resolver: add DistributionId::to_toml

Browse source 
This centralizes writing out the DistributionId as TOML. This is again
just a refactor. No behavioral changes were made. In a subsequent
commit, we will tweak how `source` is written.
This commit is contained in:
Andrew Gallant 2024-06-28 09:41:25 -04:00 • committed by Andrew Gallant
parent fcbc65c956
commit cbc83ecd8f
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/uv-resolver/src/lock.rs
View file

@ -738,9 +738,7 @@ impl Distribution {
fn to_toml(&self, dist_count_by_name: &FxHashMap<PackageName, u64>) -> anyhow::Result<Table> {
let mut table = Table::new();
table.insert("name", value(self.id.name.to_string()));
table.insert("version", value(self.id.version.to_string()));
table.insert("source", value(self.id.source.to_string()));
self.id.to_toml(None, &mut table);
if let Some(ref sdist) = self.sdist {
table.insert("sdist", value(sdist.to_toml()?));
@ -923,6 +921,21 @@ impl DistributionId {
source,
}
}
/// Writes this distribution ID inline into the table given.
///
/// When a map is given, and if the package name in this ID is unambiguous
/// (i.e., it has a count of 1 in the map), then the `version` and `source`
/// fields are omitted. In all other cases, including when a map is not
/// given, the `version` and `source` fields are written.
fn to_toml(&self, dist_count_by_name: Option<&FxHashMap<PackageName, u64>>, table: &mut Table) {
let count = dist_count_by_name.and_then(|map| map.get(&self.name).copied());
table.insert("name", value(self.name.to_string()));
if count.map(|count| count > 1).unwrap_or(true) {
table.insert("version", value(self.version.to_string()));
self.source.to_toml(table);
}
}
}
impl std::fmt::Display for DistributionId {
@ -1124,6 +1137,10 @@ impl Source {
},
)
}
fn to_toml(&self, table: &mut Table) {
table.insert("source", value(self.to_string()));
}
}
impl std::str::FromStr for Source {
@ -1778,16 +1795,9 @@ impl Dependency {
/// Returns the TOML representation of this dependency.
fn to_toml(&self, dist_count_by_name: &FxHashMap<PackageName, u64>) -> Table {
let count = dist_count_by_name
.get(&self.distribution_id.name)
.copied()
.expect("all dependencies have a corresponding distribution");
let mut table = Table::new();
table.insert("name", value(self.distribution_id.name.to_string()));
if count > 1 {
table.insert("version", value(self.distribution_id.version.to_string()));
table.insert("source", value(self.distribution_id.source.to_string()));
}
self.distribution_id
.to_toml(Some(dist_count_by_name), &mut table);
if let Some(ref extra) = self.extra {
table.insert("extra", value(extra.to_string()));
}