[split] Future.followedBy->Future.before

RB_ID=263637
twitter · Jan 8, 2014 · 2d8f0de · 2d8f0de
1 parent ff61ba5
commit 2d8f0de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/util-core/src/main/scala/com/twitter/util/Future.scala b/util-core/src/main/scala/com/twitter/util/Future.scala
@@ -737,7 +737,7 @@ abstract class Future[+A] extends Awaitable[A] {
    * discards the result of `this`. Note that this applies only
    * `Unit`-valued  Futures -- i.e. side-effects..
    */
-  def followedBy[B](f: => Future[B])(implicit ev: this.type <:< Future[Unit]): Future[B] =
+  def before[B](f: => Future[B])(implicit ev: this.type <:< Future[Unit]): Future[B] =
     transform({
       case Return(_) => f
       case Throw(t) => Future.rawException(t)

diff --git a/util-core/src/test/scala/com/twitter/util/FutureTest.scala b/util-core/src/test/scala/com/twitter/util/FutureTest.scala
@@ -820,7 +820,7 @@ class FutureTest extends WordSpec {
       }
 
       testSequence("flatMap", (a, next) => a flatMap { _ => next() })
-      testSequence("followedBy", (a, next) => a followedBy next())
+      testSequence("before", (a, next) => a before next())
 
       "flatMap (values)" should {
         val f = Future(1) flatMap { x => Future(x + 1) }