actually, let's not duplicate this either

3 files changed, 39 insertions, 44 deletions

diff --git a/src/main/scala/testbuilder.scala b/src/main/scala/testbuilder.scala
index edde1f9..f840716 100644
--- a/src/main/scala/testbuilder.scala
+++ b/src/main/scala/testbuilder.scala
@@ -1,7 +1,6 @@
 package testbuilder
 
 import java.io.OutputStream
-import language.implicitConversions
 
 import util._
 
@@ -69,12 +68,6 @@ class Builder (plan: Option[Plan], out: OutputStream) {
     }
   }
 
-  private implicit def messageToOption (message: Message): Option[String] =
-    message match {
-      case HasMessage(x) => Some(x)
-      case NoMessage     => None
-    }
-
   private class TestState {
     var passCount = 0
     var failCount = 0
diff --git a/src/main/scala/testbuilder/tap.scala b/src/main/scala/testbuilder/tap.scala
index 3857524..ba54630 100644
--- a/src/main/scala/testbuilder/tap.scala
+++ b/src/main/scala/testbuilder/tap.scala
@@ -1,7 +1,5 @@
 package testbuilder
 
-import language.implicitConversions
-
 import util._
 
 object tap {
@@ -46,10 +44,4 @@ object tap {
 
   private def join (strings: Option[Any]*): String =
     strings.flatMap(x => x).mkString(" ")
-
-  private implicit def messageToOption (message: Message): Option[String] =
-    message match {
-      case HasMessage(x) => Some(x)
-      case NoMessage     => None
-    }
 }
diff --git a/src/main/scala/testbuilder/util.scala b/src/main/scala/testbuilder/util.scala
index 1592d70..4fd5768 100644
--- a/src/main/scala/testbuilder/util.scala
+++ b/src/main/scala/testbuilder/util.scala
@@ -1,36 +1,46 @@
-package testbuilder.util
+package testbuilder
 
-trait Plan {
-  val plan:    Int
-  val skipAll: Boolean
-  val message: Option[String]
-}
+import language.implicitConversions
 
-case class NumericPlan (
-  override val plan: Int,
-  override val message: Option[String] = None
-) extends Plan {
-  override val skipAll = false
+object util {
+  trait Plan {
+    val plan:    Int
+    val skipAll: Boolean
+    val message: Option[String]
+  }
 
-  def this (plan: Int, message: String) =
-    this(plan, Some(message))
-}
+  case class NumericPlan (
+    override val plan: Int,
+    override val message: Option[String] = None
+  ) extends Plan {
+    override val skipAll = false
 
-case class SkipAll (
-  override val message: Option[String]
-) extends Plan {
-  override val plan    = 0
-  override val skipAll = true
-}
+    def this (plan: Int, message: String) =
+      this(plan, Some(message))
+  }
 
-object SkipAll {
-  def apply (reason: String) = new SkipAll(Some(reason))
-  def apply ()               = new SkipAll(None)
-}
+  case class SkipAll (
+    override val message: Option[String]
+  ) extends Plan {
+    override val plan    = 0
+    override val skipAll = true
+  }
 
-trait Message
-case class HasMessage (val contents: String) extends Message
-case object NoMessage extends Message
+  object SkipAll {
+    def apply (reason: String) = new SkipAll(Some(reason))
+    def apply ()               = new SkipAll(None)
+  }
 
-case class BailOutException (val message: String)
-  extends RuntimeException(message)
+  trait Message
+  case class HasMessage (val contents: String) extends Message
+  case object NoMessage extends Message
+
+  implicit def messageToOption (message: Message): Option[String] =
+    message match {
+      case HasMessage(x) => Some(x)
+      case NoMessage     => None
+    }
+
+  case class BailOutException (val message: String)
+    extends RuntimeException(message)
+}