Skip to content

Commit 722b30d

Browse files
authored
Auto merge of #313 - tiaanl:tests-only, r=emilio
Change color tests to check the serialized output None
2 parents aa72d31 + 0666a74 commit 722b30d

11 files changed

+29068
-27686
lines changed

src/color.rs

+7-10
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<serde::ser::Ok, serde::ser::Error>
224+
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::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, serde::de::Error>
234+
fn deserialize<D>(deserializer: D) -> Result<Self, D::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<serde::ser::Ok, serde::ser::Error>
312+
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::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, serde::de::Error>
322+
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
323323
where
324324
D: Deserializer<'de>,
325325
{
@@ -853,8 +853,7 @@ where
853853
component_parser
854854
.parse_number_or_percentage(arguments)?
855855
.unit_value()
856-
.max(0.0)
857-
.min(OPAQUE)
856+
.clamp(0.0, OPAQUE)
858857
} else {
859858
OPAQUE
860859
})
@@ -937,17 +936,15 @@ where
937936

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

943941
if uses_commas {
944942
arguments.expect_comma()?;
945943
}
946944

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

952949
let (red, green, blue) = to_rgb(hue, first_percentage, second_percentage);
953950
let red = clamp_unit_f32(red);

0 commit comments

Comments
 (0)