Skip to content
This repository was archived by the owner on Feb 13, 2021. It is now read-only.

Commit 6ea870e

Browse files
committed
update Go versions in travis config
1 parent 8b35a74 commit 6ea870e

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: go
33
sudo: false
44

55
go:
6-
- 1.3
7-
- 1.4
8-
- 1.5
6+
- 1.9
7+
- "1.10.3"
98
- tip

serialize.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,22 @@ func NewScanFromJson(b []byte) *Scan {
2020
return &scan
2121
}
2222

23-
// func (s *Scan) Json() []byte {
24-
// ss := &SerializableScan{
25-
// s,
26-
// &SerializableRequest{s.Request, ""},
27-
// &SerializableResponse{
28-
// s.Response,
29-
// &SerializableRequest{s.Request, ""},
30-
// },
31-
// }
32-
// log.Printf("DMDEBUG ss=%#v", ss)
33-
// b, err := json.Marshal(ss)
34-
// if err != nil {
35-
// log.Printf("DMDEBUG error in json.Marshal: %v", err)
36-
// s.Error("Json", err)
37-
// }
38-
// return b
39-
40-
// }
23+
func (s *Scan) Json() []byte {
24+
ss := &SerializableScan{
25+
s,
26+
&SerializableRequest{s.Request, ""},
27+
&SerializableResponse{
28+
s.Response,
29+
&SerializableRequest{s.Request, ""},
30+
},
31+
}
32+
b, err := json.Marshal(ss)
33+
if err != nil {
34+
s.Error("Json", err)
35+
}
36+
return b
37+
38+
}
4139

4240
type SerializableScan struct {
4341
*Scan

0 commit comments

Comments
 (0)