Merge pull request #663 from mpilquist/topic/move-task

Moved fs2.util.Task to fs2.Task and deleted the old, unfinished fs2.task object

Author: mpilquist

README.md

@@ -11,8 +11,7 @@ Quick links: [About the library](#about), [Docs and getting help](#docs), [How t
 FS2 is a streaming I/O library. The design goals are compositionality, expressiveness, resource safety, and speed. Here's a simple example of its use:
 
 ``` scala
-import fs2.{io, text}
-import fs2.util.Task
+import fs2.{io, text, Task}
 import java.nio.file.Paths
 
 def fahrenheitToCelsius(f: Double): Double =

benchmark/src/main/scala/fs2/benchmark/ConcurrentBenchmark.scala

@@ -1,8 +1,6 @@
 package fs2
 package benchmark
 
-import fs2.util._
-
 import org.openjdk.jmh.annotations.{Benchmark, State, Scope}
 
 @State(Scope.Thread)

benchmark/src/main/scala/fs2/benchmark/StreamBenchmark.scala

@@ -1,8 +1,6 @@
 package fs2
 package benchmark
 
-import fs2.util._
-
 import org.openjdk.jmh.annotations.{Benchmark, State, Scope}
 
 @State(Scope.Thread)

benchmark/src/main/scala/fs2/benchmark/TaskBenchmark.scala

@@ -1,8 +1,6 @@
 package fs2
 package benchmark
 
-import fs2.util._
-
 import org.openjdk.jmh.annotations.{Benchmark, State, Scope}
 
 
@@ -19,7 +17,7 @@ class TaskBenchmark extends BenchmarkUtils {
     while(i < end) {
       i += 1
       sum += i
-	}
+  }
     sum
   }
 

core/src/main/scala/fs2/Async.scala

@@ -3,7 +3,7 @@ package fs2
 import Async.{Change,Future}
 import fs2.util.{Free,Functor,Effect}
 
-@annotation.implicitNotFound("No implicit `Async[${F}]` found.\nNote that the implicit `Async[fs2.util.Task]` requires an implicit `fs2.Strategy` in scope.")
+@annotation.implicitNotFound("No implicit `Async[${F}]` found.\nNote that the implicit `Async[fs2.Task]` requires an implicit `fs2.Strategy` in scope.")
 trait Async[F[_]] extends Effect[F] { self =>
   type Ref[A]
 

core/src/main/scala/fs2/StreamDerived.scala

@@ -1,6 +1,6 @@
 package fs2
 
-import fs2.util.{Catchable,RealSupertype,Sub1,Task}
+import fs2.util.{Catchable,RealSupertype,Sub1}
 
 /** Various derived operations that are mixed into the `Stream` companion object. */
 private[fs2]