From 908b5532156a38814859070992e74aec33bdb8a8 Mon Sep 17 00:00:00 2001 From: Araq Date: Fri, 20 Sep 2019 20:15:25 +0200 Subject: asyndispatch: removed deprecated setEvent proc --- lib/pure/asyncdispatch.nim | 6 +----- tests/async/tioselectors.nim | 6 +++--- tests/async/tupcoming_async.nim | 8 ++++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/pure/asyncdispatch.nim b/lib/pure/asyncdispatch.nim index f1f27cc42..7c1b701b8 100644 --- a/lib/pure/asyncdispatch.nim +++ b/lib/pure/asyncdispatch.nim @@ -304,6 +304,7 @@ when defined(windows) or defined(nimdoc): proc verifyPresence(fd: AsyncFD) = ## Ensures that file descriptor has been registered with the dispatcher. + ## Raises ValueError if `fd` has not been registered. let p = getGlobalDispatcher() if fd notin p.handles: raise newException(ValueError, @@ -1872,8 +1873,3 @@ proc waitFor*[T](fut: Future[T]): T = poll() fut.read - -proc setEvent*(ev: AsyncEvent) {.deprecated: - "Deprecated since v0.18.0: Use 'trigger' instead.".} = - ## Set event ``ev`` to signaled state. - ev.trigger() diff --git a/tests/async/tioselectors.nim b/tests/async/tioselectors.nim index be6d3a167..e172e1452 100644 --- a/tests/async/tioselectors.nim +++ b/tests/async/tioselectors.nim @@ -128,9 +128,9 @@ elif not defined(windows): var event = newSelectEvent() selector.registerEvent(event, 1) var rc0 = selector.select(0) - event.setEvent() + event.trigger() var rc1 = selector.select(0) - event.setEvent() + event.trigger() var rc2 = selector.select(0) var rc3 = selector.select(0) assert(len(rc0) == 0 and len(rc1) == 1 and len(rc2) == 1 and len(rc3) == 0) @@ -452,7 +452,7 @@ elif not defined(windows): selector.registerHandle(sock, {Event.Read}, 1) discard selector.select(500) selector.unregister(sock) - event.setEvent() + event.trigger() joinThreads(thr) assert(counter == 1) result = true diff --git a/tests/async/tupcoming_async.nim b/tests/async/tupcoming_async.nim index 1c8271886..da98fc4d8 100644 --- a/tests/async/tupcoming_async.nim +++ b/tests/async/tupcoming_async.nim @@ -10,7 +10,7 @@ when defined(upcoming): proc delayedSet(ev: AsyncEvent, timeout: int): Future[void] {.async.} = await sleepAsync(timeout) - ev.setEvent() + ev.trigger() proc waitEvent(ev: AsyncEvent, closeEvent = false): Future[void] = var retFuture = newFuture[void]("waitEvent") @@ -39,7 +39,7 @@ when defined(upcoming): let e = newAsyncEvent() addEvent(e) do (fd: AsyncFD) -> bool: assert(not unregistered) - e.setEvent() + e.trigger() e.unregister() unregistered = true poll() @@ -52,7 +52,7 @@ when defined(upcoming): addEvent(e) do (fd: AsyncFD) -> bool: eventReceived = true return true - e.setEvent() + e.trigger() while not eventReceived: poll() try: @@ -69,7 +69,7 @@ when defined(upcoming): addEvent(e) do (fd: AsyncFD) -> bool: e.unregister() e.close() - e.setEvent() + e.trigger() poll() when ioselSupportedPlatform or defined(windows): -- cgit 1.4.1-2-gfad0