From 20f6a15af56d9b21eeca49cdca487cafc8244bd4 Mon Sep 17 00:00:00 2001
From: Zach Panzarino <zachary@panzarino.com>
Date: Sat, 5 Dec 2015 04:15:41 +0000
Subject: [PATCH] Change comparisons to increase code uniformity

---
 stdlib/public/core/Algorithm.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/stdlib/public/core/Algorithm.swift b/stdlib/public/core/Algorithm.swift
index 770971bec5bb9..774ddf147bfab 100644
--- a/stdlib/public/core/Algorithm.swift
+++ b/stdlib/public/core/Algorithm.swift
@@ -47,7 +47,7 @@ public func find<
 @warn_unused_result
 public func min<T : Comparable>(x: T, _ y: T) -> T {
   var r = x
-  if y < x {
+  if y < r {
     r = y
   }
   return r
@@ -57,7 +57,7 @@ public func min<T : Comparable>(x: T, _ y: T) -> T {
 @warn_unused_result
 public func min<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
   var r = x
-  if y < x {
+  if y < r {
     r = y
   }
   if z < r {
@@ -75,7 +75,7 @@ public func min<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
 @warn_unused_result
 public func max<T : Comparable>(x: T, _ y: T) -> T {
   var r = y
-  if y < x {
+  if r < x {
     r = x
   }
   return r
@@ -85,14 +85,14 @@ public func max<T : Comparable>(x: T, _ y: T) -> T {
 @warn_unused_result
 public func max<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
   var r = y
-  if y < x {
+  if r < x {
     r = x
   }
   if r < z {
     r = z
   }
   for t in rest {
-    if t >= r {
+    if r <= t {
       r = t
     }
   }