CIs: attempt to use csources_v1 (#16282)

* CIs: attempt to use csources_v1
* also updated the BSDs
* also updated azure pipelines
* std modules should not itself use the 'std/' import dir...
* compiler has to be careful with std/ for v1 booting
This commit is contained in:
Andreas Rumpf 2021-04-21 07:41:33 +02:00 • committed by GitHub
commit a9b62de895
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 142 additions and 143 deletions

View file

@ -29,7 +29,7 @@
## writeLine(stdout, "your password: " & myData["password"])
## writeLine(stdout, "</body></html>")
import std/[strutils, os, strtabs, cookies, uri]
import strutils, os, strtabs, cookies, uri
export uri.encodeUrl, uri.decodeUrl

View file

@ -50,7 +50,7 @@ runnableExamples:
import std/private/since
import std/math
import math
type
Deque*[T] = object

View file

@ -196,7 +196,7 @@ runnableExamples:
import std/private/since
import std/[hashes, math, algorithm]
import hashes, math, algorithm
type
KeyValuePair[A, B] = tuple[hcode: Hash, key: A, val: B]

View file

@ -36,7 +36,7 @@ runnableExamples:
{.push checks: off, line_dir: off, stack_trace: off, debugger: off.}
# the user does not want to trace a part of the standard library!
import std/math
import math
type
Complex*[T: SomeFloat] = object

View file

@ -9,7 +9,7 @@
## This module implements helper procs for parsing Cookies.
import std/[strtabs, times, options]
import strtabs, times, options
type
@ -25,7 +25,7 @@ proc parseCookies*(s: string): StringTableRef =
## "Set-Cookie" header set by servers.
runnableExamples:
import std/strtabs
let cookieJar = parseCookies("a=1; foo=bar")
let cookieJar = parseCookies("a=1; foo=bar")
assert cookieJar["a"] == "1"
assert cookieJar["foo"] == "bar"
@ -46,7 +46,7 @@ proc parseCookies*(s: string): StringTableRef =
proc setCookie*(key, value: string, domain = "", path = "",
expires = "", noName = false,
secure = false, httpOnly = false,
secure = false, httpOnly = false,
maxAge = none(int), sameSite = SameSite.Default): string =
## Creates a command in the format of
## `Set-Cookie: key=value; Domain=...; ...`

View file

@ -27,11 +27,11 @@
##
## See `packaging <packaging.html>`_ for hints on distributing Nim using OS packages.
from std/strutils import contains, toLowerAscii
from strutils import contains, toLowerAscii
when not defined(nimscript):
from std/osproc import execProcess
from std/os import existsEnv
from osproc import execProcess
from os import existsEnv
type
Distribution* {.pure.} = enum ## the list of known distributions

View file

@ -159,10 +159,9 @@ runnableExamples:
a1, a2, a0, a3, a4: int
doAssert $(%* Foo()) == """{"a1":0,"a2":0,"a0":0,"a3":0,"a4":0}"""
import
std/[hashes, tables, strutils, lexbase, streams, macros, parsejson]
import hashes, tables, strutils, lexbase, streams, macros, parsejson
import std/options # xxx remove this dependency using same approach as https://github.com/nim-lang/Nim/pull/14563
import options # xxx remove this dependency using same approach as https://github.com/nim-lang/Nim/pull/14563
import std/private/since
export
@ -921,7 +920,7 @@ proc parseJson*(s: Stream, filename: string = ""; rawIntegers = false, rawFloats
p.close()
when defined(js):
from std/math import `mod`
from math import `mod`
from std/jsffi import JSObject, `[]`, to
from std/private/jsutils import getProtoName, isInteger, isSafeInteger

View file

@ -54,7 +54,7 @@ Please use alternative packages for serialization.
It is possible to reimplement this module using generics and type traits.
Please contribute a new implementation.""".}
import std/[streams, typeinfo, json, intsets, tables, unicode]
import streams, typeinfo, json, intsets, tables, unicode
proc ptrToInt(x: pointer): int {.inline.} =
result = cast[int](x) # don't skip alignment

View file

@ -58,7 +58,7 @@ import std/private/since
{.push debugger: off.} # the user does not want to trace a part
# of the standard library!
import std/[bitops, fenv]
import bitops, fenv
when defined(c) or defined(cpp):
proc c_isnan(x: float): bool {.importc: "isnan", header: "<math.h>".}

View file

@ -15,7 +15,7 @@
## This implementation calls `initRand()` for the first call of
## `genOid`.
import std/[hashes, times, endians, random]
import hashes, times, endians, random
from std/private/decode_helpers import handleHexChar
type

View file

@ -69,7 +69,7 @@ supports pattern matching on `Option`s, with the `Some(<pattern>)` and
# xxx pending https://github.com/timotheecour/Nim/issues/376 use `runnableExamples` and `whichModule`
import std/typetraits
import typetraits
when (NimMajor, NimMinor) >= (1, 1):
type

View file

@ -44,7 +44,7 @@
include system/inclrtl
import std/private/since
import std/[strutils, pathnorm]
import strutils, pathnorm
const weirdTarget = defined(nimscript) or defined(js)
@ -65,9 +65,9 @@ since (1, 1):
when weirdTarget:
discard
elif defined(windows):
import std/[winlean, times]
import winlean, times
elif defined(posix):
import std/[posix, times]
import posix, times
proc toTime(ts: Timespec): times.Time {.inline.} =
result = initTime(ts.tv_sec.int64, ts.tv_nsec.int)
@ -1008,7 +1008,7 @@ proc expandTilde*(path: string): string {.
##
## Windows: this is still supported despite Windows platform not having this
## convention; also, both ``~/`` and ``~\`` are handled.
##
##
## .. warning:: `~bob` and `~bob/` are not yet handled correctly.
##
## See also:

View file

@ -72,7 +72,7 @@ runnableExamples:
## * `list of cryptographic and hashing modules <lib.html#pure-libraries-hashing>`_
## in the standard library
import std/[algorithm, math]
import algorithm, math
import std/private/since
include system/inclrtl
@ -625,7 +625,7 @@ proc shuffle*[T](x: var openArray[T]) =
shuffle(state, x)
when not defined(nimscript) and not defined(standalone):
import std/times
import times
proc initRand(): Rand =
## Initializes a new Rand state with a seed based on the current time.

View file

@ -21,7 +21,7 @@ runnableExamples:
doAssert r1 * r2 == -3 // 8
doAssert r1 / r2 == -2 // 3
import std/[math, hashes]
import math, hashes
type Rational*[T] = object
## A rational number, consisting of a numerator `num` and a denominator `den`.

View file

@ -17,7 +17,7 @@
## runtime efficiency.
include system/inclrtl
import std/streams
import streams
{.push debugger: off.} # the user does not want to trace a part
# of the standard library!

View file

@ -53,7 +53,7 @@ runnableExamples:
doAssert statistics.kurtosis() ~= -1.0
doAssert statistics.kurtosisS() ~= -0.7000000000000008
from std/math import FloatClass, sqrt, pow, round
from math import FloatClass, sqrt, pow, round
{.push debugger: off.} # the user does not want to trace a part
# of the standard library!

View file

@ -313,8 +313,8 @@ help with readability, since there is only so much you can cram into
single letter DSLs.
]##
import std/[macros, parseutils, unicode]
import std/strutils except format
import macros, parseutils, unicode
import strutils except format
proc mkDigit(v: int, typ: char): string {.inline.} =
assert(v < 26)

View file

@ -11,7 +11,7 @@
## macro system.
import std/private/since
import std/macros
import macros
proc checkPragma(ex, prag: var NimNode) =
since (1, 3):

View file

@ -167,7 +167,7 @@ since (1, 3, 5):
typeof(block: (for ai in a: ai))
import std/macros
import macros
macro enumLen*(T: typedesc[enum]): int =
## Returns the number of items in the enum `T`.

View file

@ -108,15 +108,15 @@
import std/private/since
import std/exitprocs
import std/[macros, strutils, streams, times, sets, sequtils]
import macros, strutils, streams, times, sets, sequtils
when declared(stdout):
import std/os
import os
const useTerminal = not defined(js)
when useTerminal:
import std/terminal
import terminal
type
TestStatus* = enum ## The status of a test when it is done.
@ -747,7 +747,7 @@ macro expect*(exceptions: varargs[typed], body: untyped): untyped =
of 2: discard parseInt("Hello World!")
of 3: raise newException(IOError, "I can't do that Dave.")
else: assert 2 + 2 == 5
expect IOError, OSError, ValueError, AssertionDefect:
defectiveRobot()

View file

@ -39,7 +39,7 @@ runnableExamples:
doAssert getDataUri("Nim", "text/plain") == "data:text/plain;charset=utf-8;base64,Tmlt"
import std/[strutils, parseutils, base64]
import strutils, parseutils, base64
import std/private/[since, decode_helpers]