From 3141acf674fd34f66141c4659a4a239779bb2802 Mon Sep 17 00:00:00 2001
From: Matthijs Hofstra <thiezz@gmail.com>
Date: Wed, 29 May 2013 20:21:04 +0200
Subject: [PATCH] Changed to a more efficient implementation.

---
 src/libstd/num/f32.rs | 10 ++--------
 src/libstd/num/f64.rs | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index 0d166c8887cd..b578084268af 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -147,18 +147,12 @@ pub fn gt(x: f32, y: f32) -> bool { return x > y; }
 
 #[inline(always)]
 pub fn fmax(x: f32, y: f32) -> f32 {
-    if x.is_NaN() { y }
-    else if y.is_NaN() { x }
-    else if x > y { x }
-    else { y }
+    if x >= y || y.is_NaN() { x } else { y }
 }
 
 #[inline(always)]
 pub fn fmin(x: f32, y: f32) -> f32 {
-    if x.is_NaN() { y }
-    else if y.is_NaN() { x }
-    else if x < y { x }
-    else { y }
+    if x <= y || y.is_NaN() { x } else { y }
 }
 
 
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
index 910e2e1e692b..bca730c57481 100644
--- a/src/libstd/num/f64.rs
+++ b/src/libstd/num/f64.rs
@@ -172,18 +172,12 @@ pub fn gt(x: f64, y: f64) -> bool { return x > y; }
 
 #[inline(always)]
 pub fn fmax(x: f64, y: f64) -> f64 {
-    if x.is_NaN() { y }
-    else if y.is_NaN() { x }
-    else if x > y { x }
-    else { y }
+    if x >= y || y.is_NaN() { x } else { y }
 }
 
 #[inline(always)]
 pub fn fmin(x: f64, y: f64) -> f64 {
-    if x.is_NaN() { y }
-    else if y.is_NaN() { x }
-    else if x < y { x }
-    else { y }
+    if x <= y || y.is_NaN() { x } else { y }
 }
 
 // FIXME (#1999): add is_normal, is_subnormal, and fpclassify