From 6166b796ba159f8aaeb741cc2359ae32037262eb Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:18:04 +0800
Subject: [PATCH] refactor os imports into corresponding small modules (#20720)

---
 compiler/vmops.nim       | 3 ++-
 lib/pure/distros.nim     | 2 +-
 lib/pure/memfiles.nim    | 3 ++-
 lib/pure/reservedmem.nim | 2 +-
 lib/pure/selectors.nim   | 3 ++-
 lib/pure/strtabs.nim     | 2 +-
 lib/std/sysrand.nim      | 2 +-
 lib/windows/registry.nim | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/compiler/vmops.nim b/compiler/vmops.nim
index be2c6f27ab..63d364405e 100644
--- a/compiler/vmops.nim
+++ b/compiler/vmops.nim
@@ -24,8 +24,9 @@ when declared(math.signbit):
 
 
 from std/envvars import getEnv, existsEnv, delEnv, putEnv, envPairs
-from std/os import walkDir, getAppFilename
+from std/os import getAppFilename
 from std/private/oscommon import dirExists, fileExists
+from std/private/osdirs import walkDir
 
 from std/times import cpuTime
 from std/hashes import hash
diff --git a/lib/pure/distros.nim b/lib/pure/distros.nim
index 052b58b07b..25c961197b 100644
--- a/lib/pure/distros.nim
+++ b/lib/pure/distros.nim
@@ -31,7 +31,7 @@ from std/strutils import contains, toLowerAscii
 
 when not defined(nimscript):
   from std/osproc import execProcess
-  from std/os import existsEnv
+  from std/envvars import existsEnv
 
 type
   Distribution* {.pure.} = enum ## the list of known distributions
diff --git a/lib/pure/memfiles.nim b/lib/pure/memfiles.nim
index d0877b311b..48c07b1492 100644
--- a/lib/pure/memfiles.nim
+++ b/lib/pure/memfiles.nim
@@ -24,7 +24,8 @@ elif defined(posix):
 else:
   {.error: "the memfiles module is not supported on your operating system!".}
 
-import os, streams
+import streams
+import std/oserrors
 
 when defined(nimPreviewSlimSystem):
   import std/[syncio, assertions]
diff --git a/lib/pure/reservedmem.nim b/lib/pure/reservedmem.nim
index 99fbe14293..d115392148 100644
--- a/lib/pure/reservedmem.nim
+++ b/lib/pure/reservedmem.nim
@@ -18,7 +18,7 @@
 ##
 ## Unstable API.
 
-from os import raiseOSError, osLastError
+from std/oserrors import raiseOSError, osLastError
 
 template distance*(lhs, rhs: pointer): int =
   cast[int](rhs) - cast[int](lhs)
diff --git a/lib/pure/selectors.nim b/lib/pure/selectors.nim
index ab7e104fcd..be5037fe2e 100644
--- a/lib/pure/selectors.nim
+++ b/lib/pure/selectors.nim
@@ -27,7 +27,8 @@
 ##
 ## TODO: `/dev/poll`, `event ports` and filesystem events.
 
-import os, nativesockets
+import nativesockets
+import std/oserrors
 
 when defined(nimPreviewSlimSystem):
   import std/assertions
diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim
index aa2886cfa3..c72e6f876e 100644
--- a/lib/pure/strtabs.nim
+++ b/lib/pure/strtabs.nim
@@ -61,7 +61,7 @@ when defined(js) or defined(nimscript) or defined(Standalone):
   {.pragma: rtlFunc.}
 else:
   {.pragma: rtlFunc, rtl.}
-  import os
+  import std/envvars
 
 include "system/inclrtl"
 
diff --git a/lib/std/sysrand.nim b/lib/std/sysrand.nim
index 9467f5033c..eeaa23d727 100644
--- a/lib/std/sysrand.nim
+++ b/lib/std/sysrand.nim
@@ -57,7 +57,7 @@ runnableExamples:
 
 
 when not defined(js):
-  import os
+  import std/oserrors
 
 when defined(posix):
   import posix
diff --git a/lib/windows/registry.nim b/lib/windows/registry.nim
index 6abc41a893..207172f8ca 100644
--- a/lib/windows/registry.nim
+++ b/lib/windows/registry.nim
@@ -9,7 +9,7 @@
 
 ## This module is experimental and its interface may change.
 
-import winlean, os
+import std/oserrors
 
 when defined(nimPreviewSlimSystem):
   import std/widestrs