From aa323a9bd8ca0b40c422b982ed8c92622b4cee7a Mon Sep 17 00:00:00 2001 From: Siarhei Barysenka Date: Fri, 4 Dec 2015 23:49:20 -0800 Subject: [PATCH] [Min & Max] Rewritten to ternary operation --- stdlib/public/core/Algorithm.swift | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/stdlib/public/core/Algorithm.swift b/stdlib/public/core/Algorithm.swift index 770971bec5bb9..f46b21b085e39 100644 --- a/stdlib/public/core/Algorithm.swift +++ b/stdlib/public/core/Algorithm.swift @@ -46,11 +46,7 @@ public func find< /// Returns the lesser of `x` and `y`. @warn_unused_result public func min(x: T, _ y: T) -> T { - var r = x - if y < x { - r = y - } - return r + return x < y ? x : y } /// Returns the least argument passed. @@ -74,11 +70,7 @@ public func min(x: T, _ y: T, _ z: T, _ rest: T...) -> T { /// Returns the greater of `x` and `y`. @warn_unused_result public func max(x: T, _ y: T) -> T { - var r = y - if y < x { - r = x - } - return r + return x > y ? x : y } /// Returns the greatest argument passed.