Skip to content

Commit 7b12654

Browse files
committed
Revert "Change color tests to check the serialized output of colors in stead of raw values."
This reverts commit 0666a74.
1 parent 722b30d commit 7b12654

11 files changed

+27686
-29068
lines changed

src/color.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ macro_rules! impl_lab_like {
221221

222222
#[cfg(feature = "serde")]
223223
impl Serialize for $cls {
224-
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
224+
fn serialize<S>(&self, serializer: S) -> Result<serde::ser::Ok, serde::ser::Error>
225225
where
226226
S: Serializer,
227227
{
@@ -231,7 +231,7 @@ macro_rules! impl_lab_like {
231231

232232
#[cfg(feature = "serde")]
233233
impl<'de> Deserialize<'de> for $cls {
234-
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
234+
fn deserialize<D>(deserializer: D) -> Result<Self, serde::de::Error>
235235
where
236236
D: Deserializer<'de>,
237237
{
@@ -309,7 +309,7 @@ macro_rules! impl_lch_like {
309309

310310
#[cfg(feature = "serde")]
311311
impl Serialize for $cls {
312-
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
312+
fn serialize<S>(&self, serializer: S) -> Result<serde::ser::Ok, serde::ser::Error>
313313
where
314314
S: Serializer,
315315
{
@@ -319,7 +319,7 @@ macro_rules! impl_lch_like {
319319

320320
#[cfg(feature = "serde")]
321321
impl<'de> Deserialize<'de> for $cls {
322-
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
322+
fn deserialize<D>(deserializer: D) -> Result<Self, serde::de::Error>
323323
where
324324
D: Deserializer<'de>,
325325
{
@@ -853,7 +853,8 @@ where
853853
component_parser
854854
.parse_number_or_percentage(arguments)?
855855
.unit_value()
856-
.clamp(0.0, OPAQUE)
856+
.max(0.0)
857+
.min(OPAQUE)
857858
} else {
858859
OPAQUE
859860
})
@@ -936,15 +937,17 @@ where
936937

937938
let first_percentage = component_parser
938939
.parse_percentage(arguments)?
939-
.clamp(0.0, 1.0);
940+
.max(0.)
941+
.min(1.);
940942

941943
if uses_commas {
942944
arguments.expect_comma()?;
943945
}
944946

945947
let second_percentage = component_parser
946948
.parse_percentage(arguments)?
947-
.clamp(0.0, 1.0);
949+
.max(0.)
950+
.min(1.);
948951

949952
let (red, green, blue) = to_rgb(hue, first_percentage, second_percentage);
950953
let red = clamp_unit_f32(red);

0 commit comments

Comments
 (0)