From d32466d20399489ae5cf254588c87e009a9c29f7 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 23 Nov 2014 18:56:24 -0800
Subject: Add challenge 4

---
 src/utils/ConversionUtils.scala | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/utils/ConversionUtils.scala')

diff --git a/src/utils/ConversionUtils.scala b/src/utils/ConversionUtils.scala
index 09f3aab..f8935f2 100644
--- a/src/utils/ConversionUtils.scala
+++ b/src/utils/ConversionUtils.scala
@@ -1,6 +1,7 @@
 package ixee.cryptopals.utils
 
 import ByteUtils._
+import FunctionUtils._
 
 object ConversionUtils {
   def hexStr2Bytes(s: String): Seq[Byte] =
@@ -61,9 +62,6 @@ object ConversionUtils {
     def asBytes = s.toSeq.map(_.toByte)
   }
 
-  // Because doing (_ f _).tupled confuses the inferencer...
-  def tup[A, B, C](f: (A, B) => C): ((A, B)) => C = f.tupled
-
   // TODO: tailrec this, get rid of for
   def toByteSeq[T : SizedNumeric : BitOps](x: T): Seq[Byte] = {
     val buf = new Array[Byte](x.byteSize)
-- 
cgit v1.1