Use f64::clamp #44
Use f64::clamp #44
Conversation
Stabilized in Rust 1.50, and resvg now has MSRV 1.65.
| @@ -310,7 +310,7 @@ fn f64_bound(min: f64, val: f64, max: f64) -> f64 { | |||
| debug_assert!(min.is_finite()); | |||
| debug_assert!(val.is_finite()); | |||
| debug_assert!(max.is_finite()); | |||
| val.max(min).min(max) | |||
| val.clamp(min, max) | |||
There was a problem hiding this comment.
Does it matter that this might introduce a panic? (In the face of wrong code…)
There was a problem hiding this comment.
Good point, but I don't think it matters. min and max aren't set by user code.
src/color.rs
Outdated
| debug_assert!(min.is_finite()); | ||
| debug_assert!(val.is_finite()); | ||
| debug_assert!(max.is_finite()); |
There was a problem hiding this comment.
| debug_assert!(min.is_finite()); | |
| debug_assert!(val.is_finite()); | |
| debug_assert!(max.is_finite()); | |
| debug_assert!(val.is_finite()); |
I don't think the f64::INFINITY case is likely to come up for min or max.
(Fwiw, I think the last assertion is a bit dodgy; infinity is fine, it's just NaN that we don't want to propagate)
There was a problem hiding this comment.
I agree that one is a bit dodgy, infinity would get clamped to the almost-surely-finite min or max anyway.
There was a problem hiding this comment.
I'll just merge it as-is (with that assertion) and not spend too much thought on it, as it's likely to go away anyway. This keeps the same behavior, which may be useful for the patch release.
Co-authored-by: Daniel McNab <[email protected]>
Stabilized in Rust 1.50, and resvg now has MSRV 1.65.