jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CIs: attempt to use csources_v1 (#16282)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/json.nim
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