Skip to content

Commit 0a22660

Browse files
authored
Fix docs examples (#15)
1 parent 1470307 commit 0a22660

5 files changed

Lines changed: 20 additions & 13 deletions

File tree

cbor_serialization.nimble

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ task test, "Run all tests":
4545
for threads in ["--threads:off", "--threads:on"]:
4646
run threads, "tests/test_all"
4747

48-
task examples, "Build examples":
49-
# Build book examples
48+
task examples, "Run examples":
49+
# Run book examples
5050
for file in listFiles("docs/examples"):
5151
if file.endsWith(".nim"):
52-
build "--threads:on", file
52+
run "--threads:on", file
5353

5454
task mdbook, "Install mdbook (requires cargo)":
5555
exec "cargo install mdbook@0.4.51 mdbook-toc@0.14.2 mdbook-open-on-gh@2.4.3 mdbook-admonish@1.20.0"

docs/examples/getstarted0.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let encoded =
2424
# Decode the CBOR blob into our Request type
2525
let decoded = Cbor.decode(encoded, Request)
2626

27-
echo decoded.id
27+
doAssert decoded.id == 1
2828
# ANCHOR_END: Decode
2929

3030
# ANCHOR: Errors

docs/examples/getstarted1.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import cbor_serialization
88
type CborRpcId = distinct CborBytes
99

1010
proc readValue*(
11-
r: var CborReader, val: var CborRpcId
11+
r: var Cbor.Reader, val: var CborRpcId
1212
) {.raises: [IOError, CborReaderError].} =
1313
let ckind = r.parser.cborKind()
1414
case ckind
@@ -33,8 +33,8 @@ type Request = object
3333
params: seq[int]
3434
id: CborRpcId # CBOR blob
3535

36-
let encoded = Cbor.encode((id: Cbor.encode("test").CborRpcId))
36+
let encoded = Cbor.encode(Request(id: Cbor.encode("test").CborRpcId))
3737
let decoded = Cbor.decode(encoded, Request)
38-
echo Cbor.decode(decoded.id.CborBytes.toBytes(), string)
38+
doAssert Cbor.decode(decoded.id.CborBytes.toBytes(), string) == "test"
3939

4040
# ANCHOR_END: Custom

docs/examples/getstarted2.nim

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,16 @@ CrpcSys.defaultSerialization Request
5454

5555
# ANCHOR: Encode
5656
let cbor = Cbor.encode(
57-
(cborrpc: "2.0", `method`: "subtract", params: [42, 3], id: Cbor.encode(1).CborBytes)
57+
Request(
58+
cborrpc: "2.0",
59+
`method`: "subtract",
60+
params: Opt.some(@[42, 3]),
61+
id: Opt.some(Cbor.encode(1).CborRpcId),
62+
)
5863
)
5964

6065
let decoded = CrpcSys.decode(cbor, Request)
6166
echo decoded
62-
doAssert CrpcSys.encode(decoded) == cbor
6367
# ANCHOR_END: Encode
68+
69+
doAssert CrpcSys.encode(decoded) == cbor

docs/examples/reference0.nim

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import cbor_serialization
22

33
# ANCHOR: Decode
4-
let rawCbor = Cbor.encode((name: "localhost", port: 42))
54
type
65
NimServer = object
76
name: string
@@ -15,8 +14,7 @@ type
1514
name: CborBytes
1615
port: CborBytes
1716

18-
var conf = defaultCborReaderConf
19-
conf.nestedDepthLimit = 0
17+
let rawCbor = Cbor.encode(NimServer(name: "localhost", port: 42))
2018

2119
# decode into native Nim
2220
let native = Cbor.decode(rawCbor, NimServer)
@@ -51,5 +49,8 @@ let blob = Cbor.encode(native)
5149
var output = memoryOutput()
5250
var writer = Cbor.Writer.init(output)
5351
writer.writeValue(native)
54-
echo Cbor.decode(output.getOutput(seq[byte]), NimServer)
52+
let decoded = Cbor.decode(output.getOutput(seq[byte]), NimServer)
53+
echo decoded
5554
# ANCHOR_END: Writer
55+
56+
doAssert decoded == native

0 commit comments

Comments
 (0)