Skip to content

Change color tests to check the serialized output #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2022
Merged

Change color tests to check the serialized output #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ macro_rules! impl_lab_like {

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

#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for $cls {
fn deserialize<D>(deserializer: D) -> Result<Self, serde::de::Error>
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
Expand Down Expand Up @@ -309,7 +309,7 @@ macro_rules! impl_lch_like {

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

#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for $cls {
fn deserialize<D>(deserializer: D) -> Result<Self, serde::de::Error>
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
Expand Down Expand Up @@ -853,8 +853,7 @@ where
component_parser
.parse_number_or_percentage(arguments)?
.unit_value()
.max(0.0)
.min(OPAQUE)
.clamp(0.0, OPAQUE)
} else {
OPAQUE
})
Expand Down Expand Up @@ -937,17 +936,15 @@ where

let first_percentage = component_parser
.parse_percentage(arguments)?
.max(0.)
.min(1.);
.clamp(0.0, 1.0);

if uses_commas {
arguments.expect_comma()?;
}

let second_percentage = component_parser
.parse_percentage(arguments)?
.max(0.)
.min(1.);
.clamp(0.0, 1.0);

let (red, green, blue) = to_rgb(hue, first_percentage, second_percentage);
let red = clamp_unit_f32(red);
Expand Down
Loading