Skip to content

Commit

Permalink
Merge #132
Browse files Browse the repository at this point in the history
132: Add the dyn keyword where trait objects are used r=Ogeon a=Ogeon

This is just because trait objects without `dyn` have been deprecated in `nightly`. A proper conversion to Rust 2018 edition will be done at a later time.

Co-authored-by: Erik Hedvall <erikwhedvall@gmail.com>
  • Loading branch information
bors[bot] and Ogeon committed Jun 16, 2019
2 parents 90c0bbf + 25859c5 commit 435b06d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions palette/src/chromatic_adaptation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ mod test {
0.7578869,
];
let xyz_scaling = Method::XyzScaling;
let computed = <TransformMatrix<D65, D50, _>>::generate_transform_matrix(&xyz_scaling);
let computed = <dyn TransformMatrix<D65, D50, _>>::generate_transform_matrix(&xyz_scaling);
for (e, c) in expected.iter().zip(computed.iter()) {
assert_relative_eq!(e, c, epsilon = 0.0001)
}
Expand All @@ -227,7 +227,7 @@ mod test {
0.0000000, 0.7578869,
];
let von_kries = Method::VonKries;
let computed = <TransformMatrix<D65, D50, _>>::generate_transform_matrix(&von_kries);
let computed = <dyn TransformMatrix<D65, D50, _>>::generate_transform_matrix(&von_kries);
for (e, c) in expected.iter().zip(computed.iter()) {
assert_relative_eq!(e, c, epsilon = 0.0001)
}
Expand All @@ -239,7 +239,7 @@ mod test {
0.0150436, 0.7521316,
];
let bradford = Method::Bradford;
let computed = <TransformMatrix<D65, D50, _>>::generate_transform_matrix(&bradford);
let computed = <dyn TransformMatrix<D65, D50, _>>::generate_transform_matrix(&bradford);
for (e, c) in expected.iter().zip(computed.iter()) {
assert_relative_eq!(e, c, epsilon = 0.0001)
}
Expand Down

0 comments on commit 435b06d

Please sign in to comment.