diff options
| -rw-r--r-- | changelog.md | 2 | ||||
| -rw-r--r-- | lib/pure/concurrency/threadpool.nim | 2 | ||||
| -rw-r--r-- | lib/std/typedthreads.nim (renamed from lib/std/threads.nim) | 0 | ||||
| -rw-r--r-- | lib/system.nim | 6 | ||||
| -rw-r--r-- | nimsuggest/nimsuggest.nim | 2 | ||||
| -rw-r--r-- | tests/arc/tweave.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/tenvvars.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/tnetdial.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/tosenv.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/tssl.nim | 2 | ||||
| -rw-r--r-- | tests/threads/t7172.nim | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/changelog.md b/changelog.md index b6e306334..ba52eff8a 100644 --- a/changelog.md +++ b/changelog.md @@ -15,7 +15,7 @@ - `std/formatfloat` - `std/objectdollar` - `std/widestrs` - - `std/threads` + - `std/typedthreads` In the future, these definitions will be removed from the `system` module, and their respective modules will have to be imported to use them. diff --git a/lib/pure/concurrency/threadpool.nim b/lib/pure/concurrency/threadpool.nim index 9d773dac5..dcc917225 100644 --- a/lib/pure/concurrency/threadpool.nim +++ b/lib/pure/concurrency/threadpool.nim @@ -23,7 +23,7 @@ when not compileOption("threads"): import cpuinfo, cpuload, locks, os when defined(nimPreviewSlimSystem): - import std/[assertions, threads] + import std/[assertions, typedthreads] {.push stackTrace:off.} diff --git a/lib/std/threads.nim b/lib/std/typedthreads.nim index 358ff0d9e..358ff0d9e 100644 --- a/lib/std/threads.nim +++ b/lib/std/typedthreads.nim diff --git a/lib/system.nim b/lib/system.nim index 6e16b1189..2373ea12e 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -2071,9 +2071,9 @@ when not defined(js): when hostOS != "standalone": include system/threadimpl when not defined(nimPreviewSlimSystem): - {.deprecated: "threads is about to move out of system; use `-d:nimPreviewSlimSystem` and import `std/threads`".} - import std/threads - export threads + {.deprecated: "threads is about to move out of system; use `-d:nimPreviewSlimSystem` and import `std/typedthreads`".} + import std/typedthreads + export typedthreads elif not defined(nogc) and not defined(nimscript): when not defined(useNimRtl) and not defined(createNimRtl): initStackBottom() diff --git a/nimsuggest/nimsuggest.nim b/nimsuggest/nimsuggest.nim index b9fff466d..c4798e88c 100644 --- a/nimsuggest/nimsuggest.nim +++ b/nimsuggest/nimsuggest.nim @@ -30,7 +30,7 @@ import compiler / [options, commands, modules, sem, pathutils] when defined(nimPreviewSlimSystem): - import std/threads + import std/typedthreads when defined(windows): import winlean diff --git a/tests/arc/tweave.nim b/tests/arc/tweave.nim index fc576f484..1c60ac403 100644 --- a/tests/arc/tweave.nim +++ b/tests/arc/tweave.nim @@ -9,7 +9,7 @@ discard """ import std/atomics when defined(nimPreviewSlimSystem): - import std/[assertions, threads] + import std/[assertions, typedthreads] const MemBlockSize = 256 diff --git a/tests/stdlib/tenvvars.nim b/tests/stdlib/tenvvars.nim index e49bd519a..03a46a013 100644 --- a/tests/stdlib/tenvvars.nim +++ b/tests/stdlib/tenvvars.nim @@ -10,7 +10,7 @@ import stdtest/testutils import std/[assertions] when not defined(js): - import std/threads + import std/typedthreads # "LATIN CAPITAL LETTER AE" in UTF-8 (0xc386) const unicodeUtf8 = "\xc3\x86" diff --git a/tests/stdlib/tnetdial.nim b/tests/stdlib/tnetdial.nim index 41485d525..a1e147ad5 100644 --- a/tests/stdlib/tnetdial.nim +++ b/tests/stdlib/tnetdial.nim @@ -5,7 +5,7 @@ discard """ """ import os, net, nativesockets, asyncdispatch -import std/[assertions, threads] +import std/[assertions, typedthreads] ## Test for net.dial diff --git a/tests/stdlib/tosenv.nim b/tests/stdlib/tosenv.nim index f715b4b70..20264102f 100644 --- a/tests/stdlib/tosenv.nim +++ b/tests/stdlib/tosenv.nim @@ -58,7 +58,7 @@ proc c_getenv(env: cstring): cstring {.importc: "getenv", header: "<stdlib.h>".} when not defined(js) and not defined(nimscript): when defined(nimPreviewSlimSystem): - import std/threads + import std/typedthreads block: # bug #18533 var thr: Thread[void] proc threadFunc {.thread.} = putEnv("foo", "fooVal2") diff --git a/tests/stdlib/tssl.nim b/tests/stdlib/tssl.nim index e4c6f68cf..f8e52ab4b 100644 --- a/tests/stdlib/tssl.nim +++ b/tests/stdlib/tssl.nim @@ -4,7 +4,7 @@ discard """ disabled: "openbsd" """ # disabled: pending bug #15713 -import std/[net, nativesockets, assertions, threads] +import std/[net, nativesockets, assertions, typedthreads] when defined(posix): import os, posix else: diff --git a/tests/threads/t7172.nim b/tests/threads/t7172.nim index 127ed456e..8dcca74a3 100644 --- a/tests/threads/t7172.nim +++ b/tests/threads/t7172.nim @@ -10,7 +10,7 @@ Crashes before getting here! """ import std/os -import std/threads +import std/typedthreads proc whatever() {.thread, nimcall.} = echo("TEST") |