Revert "put extracted modules behind the switch, to enable doc generation"

This reverts commit 71bff7d2df428896d3395d18b09c6f0c9c2fea4d.

6 files changed, 11 insertions, 17 deletions

diff --git a/lib/system.nim b/lib/system.nim
index f1fbf3f21..9e32cc971 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -2926,12 +2926,11 @@ proc compiles*(x: untyped): bool {.magic: "Compiles", noSideEffect, compileTime.
   discard
 
 
-when not defined(nimSlimSystem):
-  import system/assertions
-  export assertions
+import system/assertions
+export assertions
 
-  import system/iterators
-  export iterators
+import system/iterators
+export iterators
 
 
 proc find*[T, S](a: T, item: S): int {.inline.}=
@@ -3333,9 +3332,9 @@ template unlikely*(val: bool): bool =
     else:
       unlikelyProc(val)
 
-when not defined(nimSlimSystem):
-  import system/dollars
-  export dollars
+
+import system/dollars
+export dollars
 
 
 const
@@ -4346,10 +4345,10 @@ when defined(nimHasDefault):
   proc default*(T: typedesc): T {.magic: "Default", noSideEffect.}
     ## returns the default value of the type ``T``.
 
-when not defined(nimSlimSystem):
-  import system/widestrs
-  export widestrs
+import system/widestrs
+export widestrs
 
+when not defined(nimnoio):
   import system/io
   export io
 
diff --git a/lib/system/assertions.nim.cfg b/lib/system/assertions.nim.cfg
deleted file mode 100644
index a8ce0499d..000000000
--- a/lib/system/assertions.nim.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
---define:nimSlimSystem
-
diff --git a/lib/system/dollars.nim.cfg b/lib/system/dollars.nim.cfg
deleted file mode 100644
index 3b213c9ba..000000000
--- a/lib/system/dollars.nim.cfg
+++ /dev/null
@@ -1 +0,0 @@
---define:nimSlimSystem
diff --git a/lib/system/io.nim.cfg b/lib/system/io.nim.cfg
index 3b213c9ba..fd7cc755c 100644
--- a/lib/system/io.nim.cfg
+++ b/lib/system/io.nim.cfg
@@ -1 +1 @@
---define:nimSlimSystem
+--define: nimnoio
diff --git a/lib/system/iterators.nim.cfg b/lib/system/iterators.nim.cfg
deleted file mode 100644
index 3b213c9ba..000000000
--- a/lib/system/iterators.nim.cfg
+++ /dev/null
@@ -1 +0,0 @@
---define:nimSlimSystem
diff --git a/lib/system/widestrs.nim.cfg b/lib/system/widestrs.nim.cfg
deleted file mode 100644
index 3b213c9ba..000000000
--- a/lib/system/widestrs.nim.cfg
+++ /dev/null
@@ -1 +0,0 @@
---define:nimSlimSystem