Skip to content

Commit 15d6016

Browse files
Fix clippy::manual_clamp lints
1 parent 88c7063 commit 15d6016

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/path_builder.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -400,12 +400,7 @@ impl Arc {
400400
let (cx, cy, ang1, mut ang2) = {
401401
fn vec_angle(ux: f32, uy: f32, vx: f32, vy: f32) -> f32 {
402402
let sign = if (ux * vy - uy * vx) < 0. { -1. } else { 1. };
403-
let mut dot = ux * vx + uy * vy;
404-
if dot > 1. {
405-
dot = 1.
406-
} else if dot < -1. {
407-
dot = -1.
408-
}
403+
let dot = (ux * vx + uy * vy).clamp(-1., 1.);
409404
sign * dot.acos()
410405
}
411406
let rxsq = rx * rx;
@@ -530,12 +525,7 @@ pub fn arc(
530525
let (cx, cy, mut ang1, mut ang2) = {
531526
fn vec_angle(ux: f32, uy: f32, vx: f32, vy: f32) -> f32 {
532527
let sign = if (ux * vy - uy * vx) < 0. { -1. } else { 1. };
533-
let mut dot = ux * vx + uy * vy;
534-
if dot > 1. {
535-
dot = 1.
536-
} else if dot < -1. {
537-
dot = -1.
538-
}
528+
let dot = (ux * vx + uy * vy).clamp(-1., 1.);
539529
sign * dot.acos()
540530
}
541531
let rxsq = rx * rx;

src/segment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ impl Curve {
329329
}
330330

331331
fn satf32(x: f32) -> f32 {
332-
x.max(0.).min(1.)
332+
x.clamp(0., 1.)
333333
}
334334

335335
/// Marker that allows regrouping of previously split segments due to simplification.

0 commit comments

Comments
 (0)