|
1 | | -use std::fmt; |
2 | | -use std::str::FromStr; |
3 | | - |
4 | 1 | use rustc_hash::{FxHashMap, FxHashSet}; |
5 | | -use serde::de::{Error, MapAccess, Visitor, value::MapAccessDeserializer}; |
6 | | -use serde::{Deserialize, Deserializer}; |
7 | 2 |
|
8 | 3 | use uv_distribution_types::ResolutionRecorder; |
| 4 | +use uv_macros::DeserializeUntagged; |
9 | 5 | use uv_normalize::PackageName; |
10 | 6 | use uv_pep440::Version; |
11 | 7 |
|
@@ -44,50 +40,16 @@ impl PackageExclusion { |
44 | 40 | } |
45 | 41 |
|
46 | 42 | /// 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)] |
48 | 44 | #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema), schemars(untagged))] |
49 | | -#[serde(untagged)] |
| 45 | +#[serde(untagged, expecting = "a string or map")] |
50 | 46 | pub enum ExcludeDependency { |
| 47 | + #[untagged(map)] |
51 | 48 | Package(PackageExclusion), |
| 49 | + #[untagged(string)] |
52 | 50 | Dependency(PackageName), |
53 | 51 | } |
54 | 52 |
|
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 | | - |
91 | 53 | /// A set of packages to exclude from resolution. |
92 | 54 | #[derive(Debug, Default, Clone)] |
93 | 55 | pub struct Excludes { |
|
0 commit comments