Skip to content

Commit 925e9cd

Browse files
ungerikungerik
committed
update deps
1 parent 737f430 commit 925e9cd

File tree

9 files changed

+50
-43
lines changed

9 files changed

+50
-43
lines changed

‎cli/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/domonda/go-function/cli
33
go 1.21
44

55
require (
6-
github.com/domonda/go-function v0.0.0-20230810142503-112bf0e1774a
6+
github.com/domonda/go-function v0.0.0-20230810145703-737f430f3411
77
github.com/fatih/color v1.15.0
88
github.com/posener/complete/v2 v2.1.0
9-
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad
9+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
1010
)
1111

1212
require (
@@ -15,5 +15,5 @@ require (
1515
github.com/mattn/go-isatty v0.0.19 // indirect
1616
github.com/posener/script v1.2.0 // indirect
1717
github.com/ungerik/go-httpx v0.0.0-20230622152103-7bb636597356 // indirect
18-
golang.org/x/sys v0.11.0 // indirect
18+
golang.org/x/sys v0.13.0 // indirect
1919
)

‎cli/go.sum

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/domonda/go-function v0.0.0-20230303140353-cc4483373263 h1:9dIyV1ygIKOJwTD7WQ54guukekmF1iKGfehJbgt9pAc=
4-
github.com/domonda/go-function v0.0.0-20230303140353-cc4483373263/go.mod h1:70GdkfAD1G5yUFuKP33Wzp5KV7rKjPpduJHa3y/v3Zc=
5-
github.com/domonda/go-function v0.0.0-20230803220748-844f0c53d9dc h1:0KqGlPZ57owj3xRDENPo+mQRaJcg0kYT+7qozSWjzac=
6-
github.com/domonda/go-function v0.0.0-20230803220748-844f0c53d9dc/go.mod h1:TpV8Mpqm7rtc7PjDd1Iz6kLE59DNl4nfE4m1bQYO+Ss=
7-
github.com/domonda/go-function v0.0.0-20230810142503-112bf0e1774a h1:S8VoR2pZOQTGtVlqz7podqhKaxl3RftEmDYCPtoxPQg=
8-
github.com/domonda/go-function v0.0.0-20230810142503-112bf0e1774a/go.mod h1:bVkOqRKuO2v4+jfYt0tMSnFZwnijCAFzJ52yMLKW9lo=
3+
github.com/domonda/go-function v0.0.0-20230810145703-737f430f3411 h1:tftmDRy4jbOyoqgRUMhzwgtSeXD6dxwHnYuR4wfhPNo=
4+
github.com/domonda/go-function v0.0.0-20230810145703-737f430f3411/go.mod h1:bVkOqRKuO2v4+jfYt0tMSnFZwnijCAFzJ52yMLKW9lo=
95
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
106
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
117
github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
128
github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
139
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
1410
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
1511
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
16-
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
17-
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
1812
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
1913
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
2014
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -25,16 +19,13 @@ github.com/posener/script v1.2.0 h1:DrZz0qFT8lCLkYNi1PleLDANFnKxJ2VmlNPJbAkVLsE=
2519
github.com/posener/script v1.2.0/go.mod h1:s4sVvRXtdc/1aK6otTSeW2BVXndO8MsoOVUwK74zcg4=
2620
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
2721
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
28-
github.com/ungerik/go-httpx v0.0.0-20230212172431-5e4cf2e098cc h1:ztzHafiJ1Yu6RxE+jS/h6DlFKUS/kl2DEBAURM/G3dU=
29-
github.com/ungerik/go-httpx v0.0.0-20230212172431-5e4cf2e098cc/go.mod h1:lmKZrbxy5ypCbOkFANz0TQWE4dw9EN0S2WKdAexBbZM=
3022
github.com/ungerik/go-httpx v0.0.0-20230622152103-7bb636597356 h1:vN8FIce+59qtRe/G1xiDioVF2EK1jTaxsCrPGjyK1iM=
3123
github.com/ungerik/go-httpx v0.0.0-20230622152103-7bb636597356/go.mod h1:lmKZrbxy5ypCbOkFANz0TQWE4dw9EN0S2WKdAexBbZM=
32-
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad h1:g0bG7Z4uG+OgH2QDODnjp6ggkk1bJDsINcuWmJN1iJU=
33-
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
24+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
25+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
3426
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35-
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
3627
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37-
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
38-
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
28+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
29+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3930
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
4031
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎cmd/gen-func-wrappers/gen/generate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gen
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"path/filepath"
88
"sort"
99

@@ -69,7 +69,7 @@ func PackageFunctions(pkgDir, genFilename, namePrefix string, printOnly bool, js
6969
fmt.Println(genFileData)
7070
} else {
7171
fmt.Println("Writing file", genFilePath)
72-
err = ioutil.WriteFile(genFilePath, genFileData, 0600)
72+
err = os.WriteFile(genFilePath, genFileData, 0600)
7373
if err != nil {
7474
return err
7575
}

‎cmd/gen-func-wrappers/gen/rewrite.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"go/ast"
77
"go/token"
88
"io"
9-
"io/ioutil"
109
"os"
1110
"path/filepath"
1211
"strings"
@@ -46,7 +45,7 @@ func RewriteDir(path string, verbose bool, printOnly io.Writer, jsonTypeReplacem
4645
return nil
4746
}
4847

49-
files, err := ioutil.ReadDir(path)
48+
files, err := os.ReadDir(path)
5049
if err != nil {
5150
return err
5251
}
@@ -171,7 +170,7 @@ func RewriteAstFile(fset *token.FileSet, filePkg *ast.Package, astFile *ast.File
171170
if verbose {
172171
fmt.Println("rewriting", filePath)
173172
}
174-
return ioutil.WriteFile(filePath, rewritten, 0600)
173+
return os.WriteFile(filePath, rewritten, 0600)
175174
}
176175

177176
type wrapper struct {
@@ -323,11 +322,14 @@ func findFunctionWrappers(fset *token.FileSet, file *ast.File) []*wrapper {
323322
// and what interface is implemented
324323
//
325324
// Example:
326-
// // documentCanUserRead wraps document.CanUserRead as function.Wrapper (generated code)
327-
// var documentCanUserRead documentCanUserReadT
325+
//
326+
// // documentCanUserRead wraps document.CanUserRead as function.Wrapper (generated code)
327+
// var documentCanUserRead documentCanUserReadT
328+
//
328329
// or:
329-
// // documentCanUserReadT wraps document.CanUserRead as function.Wrapper (generated code)
330-
// type documentCanUserReadT struct{}
330+
//
331+
// // documentCanUserReadT wraps document.CanUserRead as function.Wrapper (generated code)
332+
// type documentCanUserReadT struct{}
331333
func parseImplementsComment(implementor, comment string) (wrappedFunc string, impl Impl, err error) {
332334
comment = strings.TrimSuffix(strings.TrimSpace(comment), " (generated code)")
333335
prefix := implementor + " wraps "

‎cmd/gen-func-wrappers/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.21
44

55
require (
66
github.com/ungerik/go-astvisit v0.0.0-20220317123017-e5279ac0952d
7-
golang.org/x/tools v0.12.0
7+
golang.org/x/tools v0.14.0
88
)
99

1010
require (
11-
golang.org/x/mod v0.12.0 // indirect
12-
golang.org/x/sys v0.11.0 // indirect
11+
golang.org/x/mod v0.13.0 // indirect
12+
golang.org/x/sys v0.13.0 // indirect
1313
)
1414

1515
// replace github.com/ungerik/go-astvisit => ../../../../ungerik/go-astvisit

‎cmd/gen-func-wrappers/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
github.com/ungerik/go-astvisit v0.0.0-20220317123017-e5279ac0952d h1:pdpGQaxqufVY5jBXcI9hw2l4+ebp5igMKm/zVgPOwC0=
22
github.com/ungerik/go-astvisit v0.0.0-20220317123017-e5279ac0952d/go.mod h1:dHZfG67+81PzPsDc0qw8DeFPCVE1kOrFmF0afCvfIvs=
3-
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
4-
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
5-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
6-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
7-
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
8-
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9-
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
10-
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
3+
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
4+
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
5+
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
6+
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
7+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
8+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
10+
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=

‎go.work.sum

+14
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
1818
github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
1919
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
2020
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
21+
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA=
2122
github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
2223
github.com/jhillyerd/enmime v0.10.1 h1:3VP8gFhK7R948YJBrna5bOgnTXEuPAoICo79kKkBKfA=
2324
github.com/jhillyerd/enmime v0.10.1/go.mod h1:Qpe8EEemJMFAF8+NZoWdpXvK2Yb9dRF0k/z6mkcDHsA=
25+
github.com/jhillyerd/enmime v1.0.0 h1:8swYgO1fm68PllCKz5jiLzgD3axNUS388jr6BtRSsl8=
2426
github.com/jhillyerd/enmime v1.0.0/go.mod h1:EktNOa/V6ka9yCrfoB2uxgefp1lno6OVdszW0iQ5LnM=
2527
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
2628
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -73,6 +75,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
7375
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
7476
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
7577
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
78+
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
79+
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
7680
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
7781
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
7882
golang.org/x/net v0.0.0-20210501142056-aec3718b3fa0/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
@@ -84,11 +88,14 @@ golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
8488
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
8589
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
8690
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
91+
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
8792
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
93+
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
8894
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
8995
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9096
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9197
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
98+
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
9299
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
93100
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
94101
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -113,11 +120,17 @@ golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
113120
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
114121
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
115122
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
123+
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
116124
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
125+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
126+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
117127
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
118128
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
119129
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
120130
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
131+
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
132+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
133+
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
121134
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
122135
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
123136
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -129,4 +142,5 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
129142
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
130143
mvdan.cc/xurls/v2 v2.4.0 h1:tzxjVAj+wSBmDcF6zBB7/myTy3gX9xvi8Tyr28AuQgc=
131144
mvdan.cc/xurls/v2 v2.4.0/go.mod h1:+GEjq9uNjqs8LQfM9nVnM8rff0OQ5Iash5rzX+N1CSg=
145+
mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8=
132146
mvdan.cc/xurls/v2 v2.5.0/go.mod h1:yQgaGQ1rFtJUzkmKiHYSSfuQxqfYmd//X6PxvholpeE=

‎httprequestargs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package function
33
import (
44
"encoding/json"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"net/http"
88
"strings"
99
)
@@ -23,7 +23,7 @@ func HTTPRequestArg(name, value string) HTTPRequestArgsGetter {
2323
func HTTPRequestBodyAsArg(name string) HTTPRequestArgsGetter {
2424
return func(request *http.Request) (map[string]string, error) {
2525
defer request.Body.Close()
26-
body, err := ioutil.ReadAll(request.Body)
26+
body, err := io.ReadAll(request.Body)
2727
if err != nil {
2828
return nil, err
2929
}
@@ -57,7 +57,7 @@ func HTTPRequestQueryArgs(request *http.Request) (map[string]string, error) {
5757

5858
func HTTPRequestBodyJSONFieldsAsArgs(request *http.Request) (map[string]string, error) {
5959
defer request.Body.Close()
60-
body, err := ioutil.ReadAll(request.Body)
60+
body, err := io.ReadAll(request.Body)
6161
if err != nil {
6262
return nil, err
6363
}

‎wrapperfuncs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
type StringArgsFunc func(ctx context.Context, args ...string) error
88

9-
func NewStringArgsFunc(f Wrapper, resultsHandlers ...ResultsHandler) StringArgsFunc {
9+
func NewStringArgsFunc(f CallWithStringsWrapper, resultsHandlers ...ResultsHandler) StringArgsFunc {
1010
return func(ctx context.Context, args ...string) error {
1111
results, resultErr := f.CallWithStrings(ctx, args...)
1212
for _, resultsHandler := range resultsHandlers {
@@ -21,7 +21,7 @@ func NewStringArgsFunc(f Wrapper, resultsHandlers ...ResultsHandler) StringArgsF
2121

2222
type NamedStringArgsFunc func(ctx context.Context, args map[string]string) error
2323

24-
func NewNamedStringArgsFunc(f Wrapper, resultsHandlers ...ResultsHandler) NamedStringArgsFunc {
24+
func NewNamedStringArgsFunc(f CallWithNamedStringsWrapper, resultsHandlers ...ResultsHandler) NamedStringArgsFunc {
2525
return func(ctx context.Context, args map[string]string) error {
2626
results, resultErr := f.CallWithNamedStrings(ctx, args)
2727
for _, resultsHandler := range resultsHandlers {

0 commit comments

Comments
 (0)