Sitelet https://github.com/twitter/util/commit/57533b3473b50e944ae0ee9ff3375e9c2abc67b3
Skip to content

Commit 57533b3

Browse files
Shane Delmorejenkins
Shane Delmore
authored and
jenkins
committed
Update usage of DefaultTimer to currently recommended methods
Remove deprecated com.twitter.finagle.util.DefaultTimer.get and com.twitter.util.NonFatal Differential Revision: https://phabricator.twitter.biz/D181918
1 parent b87f9d1 commit 57533b3

8 files changed

Lines changed: 11 additions & 61 deletions

File tree

‎CHANGES‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com
77
Unreleased
88

99
API Changes:
10-
10+
11+
* util-core: Removed `c.t.u.NonFatal`, use `scala.util.control.NonFatal`
12+
instead. ``PHAB_ID=D181918``
13+
1114
* util-class-preloader: This library has been removed since it deprecated. We
1215
no longer recommend that people do this. ``PHAB_ID=D174250``
1316

‎util-app/src/main/scala/com/twitter/app/App.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.twitter.app
22

33
import com.twitter.conversions.time._
4-
import com.twitter.util.{NonFatal => _, _}
4+
import com.twitter.util._
55
import java.lang.reflect.InvocationTargetException
66
import java.util.concurrent.ConcurrentLinkedQueue
77
import java.util.concurrent.atomic.AtomicReference

‎util-core/src/main/scala/com/twitter/util/Activity.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import scala.collection.JavaConverters._
77
import scala.collection.mutable.Buffer
88
import scala.language.higherKinds
99
import scala.reflect.ClassTag
10+
import scala.util.control.NonFatal
1011

1112
/**
1213
* An Activity is a handle to a concurrently running process, producing

‎util-core/src/main/scala/com/twitter/util/ClosableOnce.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.twitter.util
22

3+
import scala.util.control.NonFatal
4+
35
/**
46
* A mixin trait to describe resources that are an idempotent [[Closable]].
57
*

‎util-core/src/main/scala/com/twitter/util/NonFatal.scala‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎util-core/src/main/scala/com/twitter/util/Promise.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.twitter.util
33
import com.twitter.concurrent.Scheduler
44
import scala.annotation.tailrec
55
import scala.runtime.NonLocalReturnControl
6+
import scala.util.control.NonFatal
67

78
object Promise {
89

‎util-core/src/main/scala/com/twitter/util/RandomSocket.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.twitter.util
22

33
import java.io.IOException
44
import java.net.{InetSocketAddress, Socket}
5+
import scala.util.control.NonFatal
56

67
/**
78
* A generator of random local [[java.net.InetSocketAddress]] objects with

‎util-core/src/main/scala/com/twitter/util/Try.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.twitter.util
22

3+
import scala.util.control.NonFatal
34
import scala.util.{Success, Failure}
45

56
/**

0 commit comments

Comments
 (0)