Skip to content

Commit 5a1860e

Browse files
authored
Derive deserialization for dependency exclusions
1 parent e08e52e commit 5a1860e

3 files changed

Lines changed: 7 additions & 43 deletions

File tree

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/uv-configuration/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ uv-cache-info = { workspace = true }
2222
uv-distribution-types = { workspace = true }
2323
uv-fs = { workspace = true }
2424
uv-git = { workspace = true }
25+
uv-macros = { workspace = true }
2526
uv-normalize = { workspace = true }
2627
uv-pep440 = { workspace = true }
2728
uv-pep508 = { workspace = true }

‎crates/uv-configuration/src/excludes.rs‎

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
use std::fmt;
2-
use std::str::FromStr;
3-
41
use rustc_hash::{FxHashMap, FxHashSet};
5-
use serde::de::{Error, MapAccess, Visitor, value::MapAccessDeserializer};
6-
use serde::{Deserialize, Deserializer};
72

83
use uv_distribution_types::ResolutionRecorder;
4+
use uv_macros::DeserializeUntagged;
95
use uv_normalize::PackageName;
106
use uv_pep440::Version;
117

@@ -44,50 +40,16 @@ impl PackageExclusion {
4440
}
4541

4642
/// An exclusion, either global or scoped to a specific package version.
47-
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize)]
43+
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, DeserializeUntagged)]
4844
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema), schemars(untagged))]
49-
#[serde(untagged)]
45+
#[serde(untagged, expecting = "a string or map")]
5046
pub enum ExcludeDependency {
47+
#[untagged(map)]
5148
Package(PackageExclusion),
49+
#[untagged(string)]
5250
Dependency(PackageName),
5351
}
5452

55-
struct ExcludeDependencyVisitor;
56-
57-
impl<'de> Visitor<'de> for ExcludeDependencyVisitor {
58-
type Value = ExcludeDependency;
59-
60-
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
61-
formatter.write_str("a string or map")
62-
}
63-
64-
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
65-
where
66-
E: Error,
67-
{
68-
PackageName::from_str(value)
69-
.map(ExcludeDependency::Dependency)
70-
.map_err(E::custom)
71-
}
72-
73-
fn visit_map<M>(self, map: M) -> Result<Self::Value, M::Error>
74-
where
75-
M: MapAccess<'de>,
76-
{
77-
PackageExclusion::deserialize(MapAccessDeserializer::new(map))
78-
.map(ExcludeDependency::Package)
79-
}
80-
}
81-
82-
impl<'de> Deserialize<'de> for ExcludeDependency {
83-
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
84-
where
85-
D: Deserializer<'de>,
86-
{
87-
deserializer.deserialize_any(ExcludeDependencyVisitor)
88-
}
89-
}
90-
9153
/// A set of packages to exclude from resolution.
9254
#[derive(Debug, Default, Clone)]
9355
pub struct Excludes {

0 commit comments

Comments
 (0)
⌂ 换网址