make tests green again

6 files changed, 16 insertions, 16 deletions

diff --git a/tests/closure/texplicit_dummy_closure.nim b/tests/closure/texplicit_dummy_closure.nim
index ec608b31a..9cd8c8ca9 100644
--- a/tests/closure/texplicit_dummy_closure.nim
+++ b/tests/closure/texplicit_dummy_closure.nim
@@ -5,8 +5,8 @@ import os
 
 type
   Window = object
-    oneInstSock*: PAsyncSocket
-    IODispatcher*: PDispatcher
+    oneInstSock*: AsyncSocket
+    IODispatcher*: Dispatcher
 
 var
   win: Window
@@ -14,9 +14,9 @@ var
 proc initSocket() =
   win.oneInstSock = asyncSocket()
   #win.oneInstSock.handleAccept =
-  proc test(s: PAsyncSocket) =
-    var client: PAsyncSocket
-    proc dummy(c: PAsyncSocket) {.closure.} =
+  proc test(s: AsyncSocket) =
+    var client: AsyncSocket
+    proc dummy(c: AsyncSocket) {.closure.} =
       discard
     client.handleRead = dummy
   test(win.oneInstSock)
diff --git a/tests/closure/ttimeinfo.nim b/tests/closure/ttimeinfo.nim
index 3138ae72e..3096a5d65 100644
--- a/tests/closure/ttimeinfo.nim
+++ b/tests/closure/ttimeinfo.nim
@@ -4,12 +4,12 @@ import sequtils
 import times
 
 # 1
-proc f(n: int): TimeInfo =
-  TimeInfo(year: n, month: mJan, monthday: 1)
+proc f(n: int): DateTime =
+  DateTime(year: n, month: mJan, monthday: 1)
 
 echo toSeq(2000 || 2015).map(f)
 
 # 2
-echo toSeq(2000 || 2015).map(proc (n: int): TimeInfo =
-  TimeInfo(year: n, month: mJan, monthday: 1)
+echo toSeq(2000 || 2015).map(proc (n: int): DateTime =
+  DateTime(year: n, month: mJan, monthday: 1)
 )
diff --git a/tests/exprs/tifexpr_typeinference.nim b/tests/exprs/tifexpr_typeinference.nim
index 3ae95c571..d02492a34 100644
--- a/tests/exprs/tifexpr_typeinference.nim
+++ b/tests/exprs/tifexpr_typeinference.nim
@@ -2,10 +2,10 @@
 
 import tables
 
-proc test(): TTable[string, string] =
+proc test(): Table[string, string] =
   discard
 
-proc test2(): TTable[string, string] =
+proc test2(): Table[string, string] =
   discard
 
 var x = 5
diff --git a/tests/sets/tsets_various.nim b/tests/sets/tsets_various.nim
index 7cb9a6eec..8a63763b4 100644
--- a/tests/sets/tsets_various.nim
+++ b/tests/sets/tsets_various.nim
@@ -102,9 +102,9 @@ block tsets2:
 
 block tsets3:
   let
-    s1: TSet[int] = toSet([1, 2, 4, 8, 16])
-    s2: TSet[int] = toSet([1, 2, 3, 5, 8])
-    s3: TSet[int] = toSet([3, 5, 7])
+    s1: HashSet[int] = toSet([1, 2, 4, 8, 16])
+    s2: HashSet[int] = toSet([1, 2, 3, 5, 8])
+    s3: HashSet[int] = toSet([3, 5, 7])
 
   block union:
     let
diff --git a/tests/stdlib/tposix.nim b/tests/stdlib/tposix.nim
index 229035d22..57a43f99e 100644
--- a/tests/stdlib/tposix.nim
+++ b/tests/stdlib/tposix.nim
@@ -5,7 +5,7 @@ when not defined(windows):
   import posix
 
   var
-    u: Tutsname
+    u: Utsname
 
   discard uname(u)
 
diff --git a/tests/threads/tactors2.nim b/tests/threads/tactors2.nim
index b011ef140..e8afe203c 100644
--- a/tests/threads/tactors2.nim
+++ b/tests/threads/tactors2.nim
@@ -12,7 +12,7 @@ proc thread_proc(input: some_type): some_type {.thread.} =
   result.bla = 1
 
 proc main() =
-  var actorPool: TActorPool[some_type, some_type]
+  var actorPool: ActorPool[some_type, some_type]
   createActorPool(actorPool, 1)
 
   var some_data: some_type