Skip to content

Commit 2cee44a

Browse files
committed
Removed some deprecated dependencies
1 parent ea59680 commit 2cee44a

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

cmd/minimock/minimock.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import (
44
"bytes"
55
"flag"
66
"fmt"
7-
"go/ast"
87
"go/token"
98
"io"
10-
"io/ioutil"
119
"os"
1210
"path/filepath"
1311
"runtime/debug"
@@ -20,6 +18,7 @@ import (
2018
"github.com/hexdigest/gowrap/generator"
2119
"github.com/hexdigest/gowrap/pkg"
2220
"github.com/pkg/errors"
21+
"golang.org/x/text/cases"
2322
"golang.org/x/tools/go/packages"
2423
)
2524

@@ -34,7 +33,7 @@ var (
3433
)
3534

3635
var helpers = template.FuncMap{
37-
"title": strings.Title,
36+
"title": cases.Title,
3837
"in": func(s string, in ...string) bool {
3938
s = strings.Trim(s, " ")
4039
for _, i := range in {
@@ -132,7 +131,7 @@ func main() {
132131
func run(opts *options) (err error) {
133132
var (
134133
sourcePackage *packages.Package
135-
astPackage *ast.Package
134+
astPackage *pkg.Package
136135
fs *token.FileSet
137136
)
138137

@@ -302,7 +301,7 @@ func generate(o generator.Options) (err error) {
302301
return errors.Wrap(err, "failed to generate mock")
303302
}
304303

305-
return ioutil.WriteFile(o.OutputFile, buf.Bytes(), 0644)
304+
return os.WriteFile(o.OutputFile, buf.Bytes(), 0644)
306305
}
307306

308307
func match(s, pattern string) bool {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/gofrs/uuid/v5 v5.3.0
1717
github.com/kr/text v0.2.0 // indirect
1818
golang.org/x/mod v0.27.0 // indirect
19-
golang.org/x/text v0.22.0 // indirect
19+
golang.org/x/text v0.22.0
2020
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2121
gopkg.in/yaml.v3 v3.0.1 // indirect
2222
)

internal/types/interface.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type InterfaceSpecificationParam struct {
2525
ParamType string
2626
}
2727

28-
func FindAllInterfaces(p *ast.Package, pattern string) []InterfaceSpecification {
28+
func FindAllInterfaces(p *pkg.Package, pattern string) []InterfaceSpecification {
2929
// Filter interfaces from all the declarations
3030
interfaces := []*ast.TypeSpec{}
3131
for _, file := range p.Files {
@@ -99,7 +99,7 @@ func isExportedInterfaceAlias(typeSpec *ast.TypeSpec, fileImports []*ast.ImportS
9999

100100
name := selector.Sel.Name
101101
srcPkgPath := findSourcePackage(ident, fileImports)
102-
srcPackageAst, err := getPackageAst(srcPkgPath)
102+
srcPackageAst, err := getPackage(srcPkgPath)
103103
if err != nil {
104104
return false
105105
}
@@ -120,19 +120,14 @@ func isExportedInterfaceAlias(typeSpec *ast.TypeSpec, fileImports []*ast.ImportS
120120
return false
121121
}
122122

123-
func getPackageAst(packagePath string) (*ast.Package, error) {
123+
func getPackage(packagePath string) (*pkg.Package, error) {
124124
srcPkg, err := pkg.Load(packagePath)
125125
if err != nil {
126126
return nil, err
127127
}
128128

129129
fs := token.NewFileSet()
130-
srcAst, err := pkg.AST(fs, srcPkg)
131-
if err != nil {
132-
return nil, err
133-
}
134-
135-
return srcAst, nil
130+
return pkg.AST(fs, srcPkg)
136131
}
137132

138133
func findTypeByName(types []*ast.TypeSpec, name string) (*ast.TypeSpec, bool) {

0 commit comments

Comments
 (0)