Skip to content

Commit

Permalink
Merge #207
Browse files Browse the repository at this point in the history
207: Reorder attributes r=Ogeon a=NicolasKlenert

As mentioned in #205 [(in this comment)](#205 (review)) using derive attributes before them being introduced results in an error in the new nightly build. This PR reorders the attributes.

Co-authored-by: Nicolas Klenert <klenert.nicolas@gmail.com>
  • Loading branch information
bors[bot] and NicolasKlenert committed Mar 30, 2021
2 parents 481d20d + 0dd92e5 commit ba00c41
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions palette/src/convert.rs
Expand Up @@ -532,6 +532,7 @@ mod tests {
use crate::{Alpha, Hsl, Hsv, Hwb, Lab, Lch, Xyz, Yxy};
use crate::{FloatComponent, Limited};

#[derive(FromColorUnclamped, WithAlpha)]
#[palette(
skip_derives(Xyz, Luma),
white_point = "S::WhitePoint",
Expand All @@ -540,7 +541,6 @@ mod tests {
palette_internal,
palette_internal_not_base_type
)]
#[derive(FromColorUnclamped, WithAlpha)]
struct WithXyz<S: RgbSpace>(PhantomData<S>);

impl<S: RgbSpace> Clone for WithXyz<S> {
Expand Down Expand Up @@ -601,6 +601,7 @@ mod tests {
}
}

#[derive(Copy, Clone, FromColorUnclamped, WithAlpha)]
#[palette(
skip_derives(Lch, Luma),
white_point = "crate::white_point::E",
Expand All @@ -609,7 +610,6 @@ mod tests {
palette_internal,
palette_internal_not_base_type
)]
#[derive(Copy, Clone, FromColorUnclamped, WithAlpha)]
struct WithoutXyz<T: FloatComponent>(PhantomData<T>);

impl<T: FloatComponent> Limited for WithoutXyz<T> {
Expand Down

0 comments on commit ba00c41

Please sign in to comment.