nim-lang · timotheecour · Dec 7, 2020 · Dec 7, 2020 · Dec 7, 2020 · Apr 20, 2021
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
@@ -15,7 +15,7 @@ environment:
 tasks:
 - setup: |
     cd Nim
-    git clone --depth 1 -q https://github.com/nim-lang/csources.git
+    git clone --depth 1 -q https://github.com/nim-lang/csources_v1.git csources
     gmake -C csources -j $(sysctl -n hw.ncpu)
     bin/nim c --skipUserCfg --skipParentCfg koch
     echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv

diff --git a/.builds/openbsd_0.yml b/.builds/openbsd_0.yml
@@ -18,7 +18,7 @@ environment:
 tasks:
 - setup: |
     cd Nim
-    git clone --depth 1 -q https://github.com/nim-lang/csources.git
+    git clone --depth 1 -q https://github.com/nim-lang/csources_v1.git csources
     gmake -C csources -j $(sysctl -n hw.ncpuonline)
     bin/nim c koch
     echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv

diff --git a/.builds/openbsd_1.yml b/.builds/openbsd_1.yml
@@ -18,7 +18,7 @@ environment:
 tasks:
 - setup: |
     cd Nim
-    git clone --depth 1 -q https://github.com/nim-lang/csources.git
+    git clone --depth 1 -q https://github.com/nim-lang/csources_v1.git csources
     gmake -C csources -j $(sysctl -n hw.ncpuonline)
     bin/nim c koch
     echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv

diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml
@@ -85,7 +85,7 @@ jobs:
         id: csources-version
         shell: bash
         run: |
-          sha=$(git ls-remote https://github.com/nim-lang/csources master | cut -f 1)
+          sha=$(git ls-remote https://github.com/nim-lang/csources_v1 master | cut -f 1)
           echo "::set-output name=sha::$sha"
 
       - name: 'Get prebuilt csources from cache'
@@ -99,7 +99,7 @@ jobs:
         if: steps.csources-cache.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
         with:
-          repository: nim-lang/csources
+          repository: nim-lang/csources_v1
           path: csources
 
       - name: 'Build 1-stage compiler from csources'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -67,7 +67,7 @@ jobs:
         echo $commitMsg | grep -v '\[skip ci\]' # fails if [skip ci] not in commit msg
       displayName: 'Check whether to skip CI'
 
-    - bash: git clone --depth 1 https://github.com/nim-lang/csources
+    - bash: git clone --depth 1 https://github.com/nim-lang/csources_v1 csources
       displayName: 'Checkout Nim csources'
 
     - task: NodeTool@0

diff --git a/ci/build.bat b/ci/build.bat
@@ -2,7 +2,7 @@ REM Some debug info
 echo "Running on %CI_RUNNER_ID% (%CI_RUNNER_DESCRIPTION%) with tags %CI_RUNNER_TAGS%."
 gcc -v
 
-git clone --depth 1 https://github.com/nim-lang/csources.git
+git clone --depth 1 https://github.com/nim-lang/csources_v1.git csources
 cd csources
 call build64.bat
 cd ..

diff --git a/ci/build.sh b/ci/build.sh
@@ -1,7 +1,7 @@
 sh ci/deps.sh
 
 # Build from C sources.
-git clone --depth 1 https://github.com/nim-lang/csources.git
+git clone --depth 1 https://github.com/nim-lang/csources_v1.git csources
 cd csources
 sh build.sh
 cd ..

diff --git a/ci/nsis_build.bat b/ci/nsis_build.bat
@@ -25,7 +25,7 @@ Rem Build csources
 koch csources -d:release || exit /b
 
 rem Grab C sources and nimsuggest
-git clone --depth 1 https://github.com/nim-lang/csources.git
+git clone --depth 1 https://github.com/nim-lang/csources_v1.git csources
 
 set PATH=%CD%\bin;%PATH%
 

diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
@@ -14,7 +14,7 @@
 
 import ropes, platform, condsyms, options, msgs, lineinfos, pathutils
 
-import std/[os, strutils, osproc, sha1, streams, sequtils, times, strtabs, json]
+import os, strutils, osproc, std/sha1, streams, sequtils, times, strtabs, json
 
 type
   TInfoCCProp* = enum         # properties of the C compiler:

diff --git a/compiler/ic/cbackend.nim b/compiler/ic/cbackend.nim
@@ -18,8 +18,8 @@
 ## also doing cross-module dependency tracking and DCE that we don't need
 ## anymore. DCE is now done as prepass over the entire packed module graph.
 
-import std/[packedsets, algorithm, tables]
-  # std/intsets would give `UnusedImport`, pending https://github.com/nim-lang/Nim/issues/14246
+import std/packedsets, algorithm, tables
+
 import ".."/[ast, options, lineinfos, modulegraphs, cgendata, cgen,
   pathutils, extccomp, msgs]
 
@@ -70,7 +70,7 @@ proc addFileToLink(config: ConfigRef; m: PSym) =
     addFileToCompile(config, cf)
 
 when defined(debugDce):
-  import std / [os, packedsets]
+  import os, std/packedsets
 
 proc storeAliveSymsImpl(asymFile: AbsoluteFile; s: seq[int32]) =
   var f = rodfiles.create(asymFile.string)

diff --git a/compiler/ic/dce.nim b/compiler/ic/dce.nim
@@ -9,7 +9,10 @@
 
 ## Dead code elimination (=DCE) for IC.
 
+# PRTEMP
 import std / [intsets, tables]
+# import intsets, tables
+
 import ".." / [ast, options, lineinfos, types]
 
 import packed_ast, ic, bitabs

diff --git a/compiler/ic/ic.nim b/compiler/ic/ic.nim
@@ -7,12 +7,12 @@
 #    distribution, for details about the copyright.
 #
 
-import std / [hashes, tables, intsets, sha1]
+import hashes, tables, intsets, std/sha1
 import packed_ast, bitabs, rodfiles
 import ".." / [ast, idents, lineinfos, msgs, ropes, options,
   pathutils, condsyms]
 #import ".." / [renderer, astalgo]
-from std / os import removeFile, isAbsolute
+from os import removeFile, isAbsolute
 
 type
   PackedConfig* = object
@@ -143,7 +143,7 @@ const
   debugConfigDiff = defined(debugConfigDiff)
 
 when debugConfigDiff:
-  import std / [hashes, tables, intsets, sha1, strutils, sets]
+  import hashes, tables, intsets, sha1, strutils, sets
 
 proc configIdentical(m: PackedModule; config: ConfigRef): bool =
   result = m.definedSymbols == definedSymbolsAsString(config)

diff --git a/compiler/ic/integrity.nim b/compiler/ic/integrity.nim
@@ -10,7 +10,7 @@
 ## Integrity checking for a set of .rod files.
 ## The set must cover a complete Nim project.
 
-import std / sets
+import sets
 import ".." / [ast, modulegraphs]
 import packed_ast, bitabs, ic
 

diff --git a/compiler/ic/navigator.nim b/compiler/ic/navigator.nim
@@ -11,7 +11,7 @@
 ## IDE-like features. It uses the set of .rod files to accomplish
 ## its task. The set must cover a complete Nim project.
 
-import std / sets
+import sets
 
 from os import nil
 from std/private/miscdollars import toLocation

diff --git a/compiler/ic/packed_ast.nim b/compiler/ic/packed_ast.nim
@@ -12,7 +12,7 @@
 ## use this representation directly in all the transformations,
 ## it is superior.
 
-import std / [hashes, tables, strtabs]
+import hashes, tables, strtabs
 import bitabs
 import ".." / [ast, options]
 

diff --git a/compiler/int128.nim b/compiler/int128.nim
@@ -3,7 +3,7 @@
 ## hold all from `low(BiggestInt)` to `high(BiggestUInt)`, This
 ## type is for that purpose.
 
-from std/math import trunc
+from math import trunc
 
 type
   Int128* = object
@@ -378,7 +378,7 @@ proc `*`*(lhs, rhs: Int128): Int128 =
 proc `*=`*(a: var Int128, b: Int128) =
   a = a * b
 
-import std/bitops
+import bitops
 
 proc fastLog2*(a: Int128): int =
   if a.udata[3] != 0:

diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
@@ -35,7 +35,7 @@ import
   cgmeth, lowerings, sighashes, modulegraphs, lineinfos, rodutils,
   transf, injectdestructors, sourcemap
 
-import std/[json, sets, math, tables, intsets, strutils]
+import json, sets, math, tables, intsets, strutils
 
 from modulegraphs import ModuleGraph, PPassContext
 

diff --git a/compiler/lookups.nim b/compiler/lookups.nim
@@ -372,7 +372,7 @@ when false:
     of 'a'..'z': result = getIdent(c.cache, toLowerAscii(x.s[0]) & x.s.substr(1))
     else: result = x
 
-import std/[editdistance, heapqueue]
+import std/editdistance, heapqueue
 
 type SpellCandidate = object
   dist: int

diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim
@@ -11,7 +11,7 @@
 ## represents a complete Nim project. Single modules can either be kept in RAM
 ## or stored in a rod-file.
 
-import std / [intsets, tables, hashes, md5]
+import intsets, tables, hashes, md5
 import ast, astalgo, options, lineinfos,idents, btrees, ropes, msgs, pathutils
 import ic / [packed_ast, ic]
 

diff --git a/compiler/nilcheck.nim b/compiler/nilcheck.nim
@@ -8,7 +8,7 @@
 #
 
 import ast, renderer, intsets, tables, msgs, options, lineinfos, strformat, idents, treetab, hashes
-import sequtils, strutils, std / sets
+import sequtils, strutils, sets
 
 # IMPORTANT: notes not up to date, i'll update this comment again
 #

diff --git a/compiler/nim.nim b/compiler/nim.nim
@@ -24,7 +24,7 @@ import
   idents, lineinfos, cmdlinehelper,
   pathutils, modulegraphs
 
-from std/browsers import openDefaultBrowser
+from browsers import openDefaultBrowser
 from nodejs import findNodeJs
 
 when hasTinyCBackend:

diff --git a/compiler/nimpaths.nim b/compiler/nimpaths.nim
@@ -17,7 +17,7 @@ interpolation variables:
 Unstable API
 ]##
 
-import std/[os,strutils]
+import os, strutils
 
 const
   docCss* = "$nimr/doc/nimdoc.css"

diff --git a/compiler/rodutils.nim b/compiler/rodutils.nim
@@ -8,7 +8,7 @@
 #
 
 ## Serialization utilities for the compiler.
-import std/[strutils, math]
+import strutils, math
 
 # bcc on windows doesn't have C99 functions
 when defined(windows) and defined(bcc):

diff --git a/compiler/semdata.nim b/compiler/semdata.nim
@@ -9,7 +9,7 @@
 
 ## This module contains the data structures for the semantic checking phase.
 
-import std / tables
+import tables
 
 import
   intsets, options, ast, astalgo, msgs, idents, renderer,

diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
@@ -10,7 +10,7 @@
 # this module does the semantic checking of type declarations
 # included from sem.nim
 
-import std/math
+import math
 
 const
   errStringOrIdentNodeExpected = "string or ident node expected"

diff --git a/compiler/vmdef.nim b/compiler/vmdef.nim
@@ -10,7 +10,7 @@
 ## This module contains the type definitions for the new evaluation engine.
 ## An instruction is 1-3 int32s in memory, it is a register based VM.
 
-import std / tables
+import tables
 
 import ast, idents, options, modulegraphs, lineinfos
 

diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
@@ -27,7 +27,7 @@
 # solves the opcLdConst vs opcAsgnConst issue. Of course whether we need
 # this copy depends on the involved types.
 
-import std / tables
+import tables
 
 import
   strutils, ast, types, msgs, renderer, vmdef,

diff --git a/compiler/vmops.nim b/compiler/vmops.nim
@@ -9,24 +9,24 @@
 
 # Unfortunately this cannot be a module yet:
 #import vmdeps, vm
-from std/math import sqrt, ln, log10, log2, exp, round, arccos, arcsin,
+from math import sqrt, ln, log10, log2, exp, round, arccos, arcsin,
   arctan, arctan2, cos, cosh, hypot, sinh, sin, tan, tanh, pow, trunc,
   floor, ceil, `mod`, cbrt, arcsinh, arccosh, arctanh, erf, erfc, gamma,
   lgamma
 
 when declared(math.copySign):
-  from std/math import copySign
+  from math import copySign
 
 when declared(math.signbit):
-  from std/math import signbit
+  from math import signbit
 
-from std/os import getEnv, existsEnv, dirExists, fileExists, putEnv, walkDir,
+from os import getEnv, existsEnv, dirExists, fileExists, putEnv, walkDir,
                    getAppFilename, raiseOSError, osLastError
 
-from std/md5 import getMD5
-from std/times import cpuTime
-from std/hashes import hash
-from std/osproc import nil
+from md5 import getMD5
+from times import cpuTime
+from hashes import hash
+from osproc import nil
 
 from sighashes import symBodyDigest