From 29d9274e0367d1d3146b2c5954f106456f3b6ab3 Mon Sep 17 00:00:00 2001 From: cheatfate Date: Thu, 24 Oct 2019 16:01:57 +0300 Subject: [PATCH] Fix some compilation warnings. --- chronos/asyncloop.nim | 11 ++++++++--- tests/testaddress.nim | 2 ++ tests/testasyncstream.nim | 2 ++ tests/testbugs.nim | 2 ++ tests/testdatagram.nim | 2 ++ tests/testfut.nim | 2 ++ tests/testmacro.nim | 2 ++ tests/testnet.nim | 2 ++ tests/testserver.nim | 2 ++ tests/testsignal.nim | 2 ++ tests/testsoon.nim | 2 ++ tests/teststream.nim | 2 ++ tests/testsync.nim | 2 ++ tests/testtime.nim | 2 ++ 14 files changed, 34 insertions(+), 3 deletions(-) diff --git a/chronos/asyncloop.nim b/chronos/asyncloop.nim index 515a446..5ba56a7 100644 --- a/chronos/asyncloop.nim +++ b/chronos/asyncloop.nim @@ -362,13 +362,13 @@ when defined(windows) or defined(nimdoc): ## Creates a new Dispatcher instance. new result result.ioPort = createIoCompletionPort(INVALID_HANDLE_VALUE, 0, 0, 1) - when compiles(initHashSet): + when declared(initHashSet): # After 0.20.0 Nim's stdlib version result.handles = initHashSet[AsyncFD]() else: # Pre 0.20.0 Nim's stdlib version result.handles = initSet[AsyncFD]() - when compiles(initHeapQueue): + when declared(initHeapQueue): # After 0.20.0 Nim's stdlib version result.timers = initHeapQueue[TimerCallback]() else: @@ -510,7 +510,12 @@ elif unixPlatform: ## Create new dispatcher. new result result.selector = newSelector[SelectorData]() - result.timers.newHeapQueue() + when declared(initHeapQueue): + # After 0.20.0 Nim's stdlib version + result.timers = initHeapQueue() + else: + # Before 0.20.0 Nim's stdlib version + result.timers.newHeapQueue() result.callbacks = initDeque[AsyncCallback](64) result.keys = newSeq[ReadyKey](64) result.trackers = initTable[string, TrackerBase]() diff --git a/tests/testaddress.nim b/tests/testaddress.nim index 7855a21..56c9f82 100644 --- a/tests/testaddress.nim +++ b/tests/testaddress.nim @@ -8,6 +8,8 @@ import strutils, unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "TransportAddress test suite": test "initTAddress(string)": check $initTAddress("0.0.0.0:1") == "0.0.0.0:1" diff --git a/tests/testasyncstream.nim b/tests/testasyncstream.nim index 7b52df5..a5c7a04 100644 --- a/tests/testasyncstream.nim +++ b/tests/testasyncstream.nim @@ -8,6 +8,8 @@ import strutils, unittest, os import ../chronos, ../chronos/streams/tlsstream +when defined(nimHasUsed): {.used.} + const SelfSignedRsaKey = """ -----BEGIN PRIVATE KEY----- MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDSXcKMR6zIIHSy diff --git a/tests/testbugs.nim b/tests/testbugs.nim index 3a78f8b..6154d3b 100644 --- a/tests/testbugs.nim +++ b/tests/testbugs.nim @@ -8,6 +8,8 @@ import unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "Asynchronous issues test suite": const HELLO_PORT = 45679 const TEST_MSG = "testmsg" diff --git a/tests/testdatagram.nim b/tests/testdatagram.nim index b2dfec0..3cde640 100644 --- a/tests/testdatagram.nim +++ b/tests/testdatagram.nim @@ -8,6 +8,8 @@ import strutils, net, unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "Datagram Transport test suite": const TestsCount = 2000 diff --git a/tests/testfut.nim b/tests/testfut.nim index ad0fa3e..d0725b2 100644 --- a/tests/testfut.nim +++ b/tests/testfut.nim @@ -8,6 +8,8 @@ import unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "Future[T] behavior test suite": proc testFuture1(): Future[int] {.async.} = await sleepAsync(0.milliseconds) diff --git a/tests/testmacro.nim b/tests/testmacro.nim index ac50983..19e8e49 100644 --- a/tests/testmacro.nim +++ b/tests/testmacro.nim @@ -8,6 +8,8 @@ import unittest import ../chronos +when defined(nimHasUsed): {.used.} + proc asyncRetValue(n: int): Future[int] {.async.} = await sleepAsync(n.milliseconds) result = n * 10 diff --git a/tests/testnet.nim b/tests/testnet.nim index 5d00161..76139ac 100644 --- a/tests/testnet.nim +++ b/tests/testnet.nim @@ -8,6 +8,8 @@ import unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "Network utilities test suite": const MaskVectors = [ diff --git a/tests/testserver.nim b/tests/testserver.nim index d1cadd2..890208d 100644 --- a/tests/testserver.nim +++ b/tests/testserver.nim @@ -8,6 +8,8 @@ import strutils, unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "Server's test suite": type CustomServer = ref object of StreamServer diff --git a/tests/testsignal.nim b/tests/testsignal.nim index 0b7d64d..b860556 100644 --- a/tests/testsignal.nim +++ b/tests/testsignal.nim @@ -8,6 +8,8 @@ import unittest, strutils import ../chronos +when defined(nimHasUsed): {.used.} + when not defined(windows): import posix diff --git a/tests/testsoon.nim b/tests/testsoon.nim index b8a79e7..dfa712b 100644 --- a/tests/testsoon.nim +++ b/tests/testsoon.nim @@ -8,6 +8,8 @@ import unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "callSoon() tests suite": const CallSoonTests = 10 var soonTest1 = 0'u diff --git a/tests/teststream.nim b/tests/teststream.nim index 2ce9a0e..6c1bbc3 100644 --- a/tests/teststream.nim +++ b/tests/teststream.nim @@ -8,6 +8,8 @@ import strutils, unittest, os import ../chronos +when defined(nimHasUsed): {.used.} + when defined(windows): import winlean else: diff --git a/tests/testsync.nim b/tests/testsync.nim index 02b9433..56c6a77 100644 --- a/tests/testsync.nim +++ b/tests/testsync.nim @@ -8,6 +8,8 @@ import unittest import ../chronos +when defined(nimHasUsed): {.used.} + suite "Asynchronous sync primitives test suite": var testLockResult = "" var testEventResult = "" diff --git a/tests/testtime.nim b/tests/testtime.nim index 00401d9..56649e3 100644 --- a/tests/testtime.nim +++ b/tests/testtime.nim @@ -8,6 +8,8 @@ import os, unittest import ../chronos, ../chronos/timer +when defined(nimHasUsed): {.used.} + suite "Asynchronous timers test suite": const TimersCount = 10