diff --git a/lib/pure/reservedmem.nim b/lib/pure/reservedmem.nim index 85a6e324f7..469ca7efaa 100644 --- a/lib/pure/reservedmem.nim +++ b/lib/pure/reservedmem.nim @@ -18,7 +18,7 @@ ## ## Unstable API. -from ospaths import raiseOSError, osLastError +from os import raiseOSError, osLastError template distance*(lhs, rhs: pointer): int = cast[int](rhs) - cast[int](lhs) diff --git a/lib/pure/ssl_certs.nim b/lib/pure/ssl_certs.nim index 9845de9b6a..806316b027 100644 --- a/lib/pure/ssl_certs.nim +++ b/lib/pure/ssl_certs.nim @@ -11,7 +11,7 @@ ## SSL_CERT_DIR environment variables. import os, strutils -from ospaths import existsEnv, getEnv +from os import existsEnv, getEnv import strutils # SECURITY: this unnecessarily scans through dirs/files regardless of the diff --git a/nimpretty/tests/expected/wrong_ind.nim b/nimpretty/tests/expected/wrong_ind.nim index 95a35a8fd3..3ff9de91cc 100644 --- a/nimpretty/tests/expected/wrong_ind.nim +++ b/nimpretty/tests/expected/wrong_ind.nim @@ -2,7 +2,7 @@ # bug #9505 import std/[ - strutils, ospaths, os + strutils, os ] import pkg/[ regex diff --git a/nimpretty/tests/wrong_ind.nim b/nimpretty/tests/wrong_ind.nim index 3c7544cdb7..a042e88226 100644 --- a/nimpretty/tests/wrong_ind.nim +++ b/nimpretty/tests/wrong_ind.nim @@ -2,7 +2,7 @@ # bug #9505 import std/[ - strutils, ospaths, os + strutils, os ] import pkg/[ regex diff --git a/tests/untestable/thttpclient_ssl_disabled.nim b/tests/untestable/thttpclient_ssl_disabled.nim index 4d4ede4de3..0f7e958317 100644 --- a/tests/untestable/thttpclient_ssl_disabled.nim +++ b/tests/untestable/thttpclient_ssl_disabled.nim @@ -12,7 +12,7 @@ import httpclient, net, unittest, - ospaths + os from strutils import contains diff --git a/tests/untestable/thttpclient_ssl_env_var.nim b/tests/untestable/thttpclient_ssl_env_var.nim index 32af435799..3f25a6ff4c 100644 --- a/tests/untestable/thttpclient_ssl_env_var.nim +++ b/tests/untestable/thttpclient_ssl_env_var.nim @@ -13,7 +13,7 @@ ## SSL_CERT_FILE=BogusInexistentFileName tests/untestable/thttpclient_ssl_env_var ## SSL_CERT_DIR=BogusInexistentDirName tests/untestable/thttpclient_ssl_env_var -import httpclient, unittest, ospaths +import httpclient, unittest, os from net import newSocket, newContext, wrapSocket, connect, close, Port, CVerifyPeerUseEnvVars from strutils import contains