djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clippy fix

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-09-06 07:49:49 +02:00
parent a9fd7537c2
commit 847f18248f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
egui/src/math.rs
View file

@ -27,6 +27,7 @@ where
/// so that when `x == from.start()` returns `to.start()` /// so that when `x == from.start()` returns `to.start()`
/// and when `x == from.end()` returns `to.end()`. /// and when `x == from.end()` returns `to.end()`.
pub fn remap(x: f32, from: RangeInclusive<f32>, to: RangeInclusive<f32>) -> f32 { pub fn remap(x: f32, from: RangeInclusive<f32>, to: RangeInclusive<f32>) -> f32 {
#![allow(clippy::float_cmp)]
debug_assert!(from.start() != from.end()); debug_assert!(from.start() != from.end());
let t = (x - from.start()) / (from.end() - from.start()); let t = (x - from.start()) / (from.end() - from.start());
lerp(to, t) lerp(to, t)
@ -34,6 +35,7 @@ pub fn remap(x: f32, from: RangeInclusive<f32>, to: RangeInclusive<f32>) -> f32
/// Like `remap`, but also clamps the value so that the returned value is always in the `to` range. /// Like `remap`, but also clamps the value so that the returned value is always in the `to` range.
pub fn remap_clamp(x: f32, from: RangeInclusive<f32>, to: RangeInclusive<f32>) -> f32 { pub fn remap_clamp(x: f32, from: RangeInclusive<f32>, to: RangeInclusive<f32>) -> f32 {
#![allow(clippy::float_cmp)]
if from.end() < from.start() { if from.end() < from.start() {
return remap_clamp(x, *from.end()..=*from.start(), *to.end()..=*to.start()); return remap_clamp(x, *from.end()..=*from.start(), *to.end()..=*to.start());
} }