diff options
author | Araq <rumpf_a@web.de> | 2019-07-19 17:25:04 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2019-07-19 17:25:04 +0200 |
commit | 5a020d641dde24b1af4705baf5bf7c2517d63b97 (patch) | |
tree | c3d7eb954e8bc29cc71e62513aa72eba062616c9 /lib | |
parent | 313cc337f27ed6280b1021e7c1d2afb681044b94 (diff) | |
download | Nim-5a020d641dde24b1af4705baf5bf7c2517d63b97.tar.gz |
style improvements; fixes #11774
Diffstat (limited to 'lib')
-rw-r--r-- | lib/nimhcr.nim | 6 | ||||
-rw-r--r-- | lib/pure/coro.nim | 2 | ||||
-rw-r--r-- | lib/pure/net.nim | 2 | ||||
-rw-r--r-- | lib/system.nim | 2 | ||||
-rw-r--r-- | lib/system/threadlocalstorage.nim | 4 | ||||
-rw-r--r-- | lib/wrappers/openssl.nim | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/lib/nimhcr.nim b/lib/nimhcr.nim index 37331b825..26b570b62 100644 --- a/lib/nimhcr.nim +++ b/lib/nimhcr.nim @@ -120,10 +120,10 @@ # - state in static libs gets duplicated # - linking is slow and therefore iteration time suffers # - have just a single .dll for all .nim files and bulk reload? -# - think about the compile/link/passC/passL/emit/injectStmt pragmas -# - if a passC pragma is introduced (either written or dragged in by a new +# - think about the compile/link/passc/passl/emit/injectStmt pragmas +# - if a passc pragma is introduced (either written or dragged in by a new # import) the whole command line for compilation changes - for example: -# winlean.nim: {.passC: "-DWIN32_LEAN_AND_MEAN".} +# winlean.nim: {.passc: "-DWIN32_LEAN_AND_MEAN".} # - play with plugins/dlls/lfIndirect/lfDynamicLib/lfExportLib - shouldn't add an extra '*' # - everything thread-local related # - tests diff --git a/lib/pure/coro.nim b/lib/pure/coro.nim index d6a7ceec8..4b446f44c 100644 --- a/lib/pure/coro.nim +++ b/lib/pure/coro.nim @@ -122,7 +122,7 @@ when defined(unix): const extra = " -D_XOPEN_SOURCE" else: const extra = "" - {.passC: "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" & extra.} + {.passc: "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" & extra.} const CORO_CREATED = 0 diff --git a/lib/pure/net.nim b/lib/pure/net.nim index 6e2f5d049..a2a3252de 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -1110,7 +1110,7 @@ proc waitFor(socket: Socket, waited: var Duration, timeout, size: int, if selRet < 0: raiseOSError(osLastError()) if selRet != 1: raise newException(TimeoutError, "Call to '" & funcName & "' timed out.") - waited += (getMonoTIme() - startTime) + waited += (getMonoTime() - startTime) proc recv*(socket: Socket, data: pointer, size: int, timeout: int): int {. tags: [ReadIOEffect, TimeEffect].} = diff --git a/lib/system.nim b/lib/system.nim index 722b70d79..a588a85b9 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -4060,7 +4060,7 @@ proc staticExec*(command: string, input = "", cache = ""): string {. ## `gorge <#gorge,string,string,string>`_ is an alias for ``staticExec``. ## ## Note that you can use this proc inside a pragma like - ## `passC <nimc.html#passc-pragma>`_ or `passL <nimc.html#passl-pragma>`_. + ## `passc <nimc.html#passc-pragma>`_ or `passl <nimc.html#passl-pragma>`_. ## ## If ``cache`` is not empty, the results of ``staticExec`` are cached within ## the ``nimcache`` directory. Use ``--forceBuild`` to get rid of this caching diff --git a/lib/system/threadlocalstorage.nim b/lib/system/threadlocalstorage.nim index 6ab038a27..d384b954b 100644 --- a/lib/system/threadlocalstorage.nim +++ b/lib/system/threadlocalstorage.nim @@ -108,10 +108,10 @@ elif defined(genode): else: when not (defined(macosx) or defined(haiku)): - {.passL: "-pthread".} + {.passl: "-pthread".} when not defined(haiku): - {.passC: "-pthread".} + {.passc: "-pthread".} const schedh = "#define _GNU_SOURCE\n#include <sched.h>" diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim index dc9587d2c..482062617 100644 --- a/lib/wrappers/openssl.nim +++ b/lib/wrappers/openssl.nim @@ -20,7 +20,7 @@ ## ## .. code-block:: ## ./bin/nim c -d:ssl -p:. -r tests/untestable/tssl.nim -## ./bin/nim c -d:ssl -p:. --dynlibOverride:ssl --passL:-lcrypto --passL:-lssl -r tests/untestable/tssl.nim +## ./bin/nim c -d:ssl -p:. --dynlibOverride:ssl --passl:-lcrypto --passl:-lssl -r tests/untestable/tssl.nim {.deadCodeElim: on.} # dce option deprecated when defined(nimHasStyleChecks): |