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

std/options: $some(3) is now "some(3)", etc. (#17147)

Browse source 
* std/options: $some(3) is now "some(3)", not "Some(3)", `$none(int)` is now `"none(int)"` instead of `"None[int]"`

* fix tests

* disable optionsutils
This commit is contained in:
Timothee Cour 2021-02-24 14:17:16 -08:00 • committed by GitHub
commit 578d1ee751
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/generics/tgenerics_issues.nim
View file

@ -24,9 +24,9 @@ G:0,1:0.1
G:0,1:0.1
H:1:0.1
0
(foo: None[seq[Foo]], s: "")
(foo: Some(@[(a: "world", bar: None[Bar])]), s: "hello,")
@[(a: "hey", bar: None[Bar])]
(foo: none(seq[Foo]), s: "")
(foo: some(@[(a: "world", bar: none(Bar))]), s: "hello,")
@[(a: "hey", bar: none(Bar))]
'''
joinable: false
"""

4
tests/stdlib/tmarshal.nim
View file

@ -116,8 +116,8 @@ block:
let
a1 = some(newJNull())
a2 = none(JsonNode)
doAssert $($$a1).to[:Option[JsonNode]] == "Some(null)"
doAssert $($$a2).to[:Option[JsonNode]] == "None[JsonNode]"
doAssert $($$a1).to[:Option[JsonNode]] == "some(null)"
doAssert $($$a2).to[:Option[JsonNode]] == "none(JsonNode)"
doAssert ($$a1).to[:Option[JsonNode]] == some(newJNull())
doAssert ($$a2).to[:Option[JsonNode]] == none(JsonNode)

10
tests/stdlib/toptions.nim
View file

@ -82,8 +82,8 @@ proc main() =
doAssert(stringNone.get("Correct") == "Correct")
block stringify:
doAssert($(some("Correct")) == "Some(\"Correct\")")
doAssert($(stringNone) == "None[string]")
doAssert($(some("Correct")) == "some(\"Correct\")")
doAssert($(stringNone) == "none(string)")
disableJsVm:
block map_with_a_void_result:
@ -155,7 +155,7 @@ proc main() =
name: string
let nobody = none(Named)
doAssert($nobody == "None[Named]")
doAssert($nobody == "none(Named)")
# "$ on type with name()"
block:
@ -163,7 +163,7 @@ proc main() =
myname: string
let noperson = none(Person)
doAssert($noperson == "None[Person]")
doAssert($noperson == "none(Person)")
# "Ref type with overloaded `==`"
block:
@ -190,7 +190,7 @@ proc main() =
block:
let x = none(cstring)
doAssert x.isNone
doAssert $x == "None[cstring]"
doAssert $x == "none(cstring)"
static: main()