Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5059f0b

Browse files
kmuratovkmuratov
committed
Fixes for govet
1 parent c31948c commit 5059f0b

File tree

6 files changed

+25
-26
lines changed

6 files changed

+25
-26
lines changed

‎.golangci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ output:
88
linters:
99
disable:
1010
- errcheck
11-
- govet
1211
- staticcheck

‎source/github/github.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,23 @@ func (g *Github) Close() error {
126126

127127
func (g *Github) First() (version uint, er error) {
128128
if v, ok := g.migrations.First(); !ok {
129-
return 0, &os.PathError{"first", g.path, os.ErrNotExist}
129+
return 0, &os.PathError{Op: "first", Path: g.path, Err: os.ErrNotExist}
130130
} else {
131131
return v, nil
132132
}
133133
}
134134

135135
func (g *Github) Prev(version uint) (prevVersion uint, err error) {
136136
if v, ok := g.migrations.Prev(version); !ok {
137-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), g.path, os.ErrNotExist}
137+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: g.path, Err: os.ErrNotExist}
138138
} else {
139139
return v, nil
140140
}
141141
}
142142

143143
func (g *Github) Next(version uint) (nextVersion uint, err error) {
144144
if v, ok := g.migrations.Next(version); !ok {
145-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), g.path, os.ErrNotExist}
145+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: g.path, Err: os.ErrNotExist}
146146
} else {
147147
return v, nil
148148
}
@@ -162,7 +162,7 @@ func (g *Github) ReadUp(version uint) (r io.ReadCloser, identifier string, err e
162162
return ioutil.NopCloser(strings.NewReader(r)), m.Identifier, nil
163163
}
164164
}
165-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), g.path, os.ErrNotExist}
165+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: g.path, Err: os.ErrNotExist}
166166
}
167167

168168
func (g *Github) ReadDown(version uint) (r io.ReadCloser, identifier string, err error) {
@@ -179,5 +179,5 @@ func (g *Github) ReadDown(version uint) (r io.ReadCloser, identifier string, err
179179
return ioutil.NopCloser(strings.NewReader(r)), m.Identifier, nil
180180
}
181181
}
182-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), g.path, os.ErrNotExist}
182+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: g.path, Err: os.ErrNotExist}
183183
}

‎source/gitlab/gitlab.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,23 @@ func (g *Gitlab) Close() error {
159159

160160
func (g *Gitlab) First() (version uint, er error) {
161161
if v, ok := g.migrations.First(); !ok {
162-
return 0, &os.PathError{"first", g.path, os.ErrNotExist}
162+
return 0, &os.PathError{Op: "first", Path: g.path, Err: os.ErrNotExist}
163163
} else {
164164
return v, nil
165165
}
166166
}
167167

168168
func (g *Gitlab) Prev(version uint) (prevVersion uint, err error) {
169169
if v, ok := g.migrations.Prev(version); !ok {
170-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), g.path, os.ErrNotExist}
170+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: g.path, Err: os.ErrNotExist}
171171
} else {
172172
return v, nil
173173
}
174174
}
175175

176176
func (g *Gitlab) Next(version uint) (nextVersion uint, err error) {
177177
if v, ok := g.migrations.Next(version); !ok {
178-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), g.path, os.ErrNotExist}
178+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: g.path, Err: os.ErrNotExist}
179179
} else {
180180
return v, nil
181181
}
@@ -200,7 +200,7 @@ func (g *Gitlab) ReadUp(version uint) (r io.ReadCloser, identifier string, err e
200200
return ioutil.NopCloser(strings.NewReader(string(content))), m.Identifier, nil
201201
}
202202

203-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), g.path, os.ErrNotExist}
203+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: g.path, Err: os.ErrNotExist}
204204
}
205205

206206
func (g *Gitlab) ReadDown(version uint) (r io.ReadCloser, identifier string, err error) {
@@ -222,5 +222,5 @@ func (g *Gitlab) ReadDown(version uint) (r io.ReadCloser, identifier string, err
222222
return ioutil.NopCloser(strings.NewReader(string(content))), m.Identifier, nil
223223
}
224224

225-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), g.path, os.ErrNotExist}
225+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: g.path, Err: os.ErrNotExist}
226226
}

‎source/go_bindata/go-bindata.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,23 @@ func (b *Bindata) Close() error {
7474

7575
func (b *Bindata) First() (version uint, err error) {
7676
if v, ok := b.migrations.First(); !ok {
77-
return 0, &os.PathError{"first", b.path, os.ErrNotExist}
77+
return 0, &os.PathError{Op: "first", Path: b.path, Err: os.ErrNotExist}
7878
} else {
7979
return v, nil
8080
}
8181
}
8282

8383
func (b *Bindata) Prev(version uint) (prevVersion uint, err error) {
8484
if v, ok := b.migrations.Prev(version); !ok {
85-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), b.path, os.ErrNotExist}
85+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: b.path, Err: os.ErrNotExist}
8686
} else {
8787
return v, nil
8888
}
8989
}
9090

9191
func (b *Bindata) Next(version uint) (nextVersion uint, err error) {
9292
if v, ok := b.migrations.Next(version); !ok {
93-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), b.path, os.ErrNotExist}
93+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: b.path, Err: os.ErrNotExist}
9494
} else {
9595
return v, nil
9696
}
@@ -104,7 +104,7 @@ func (b *Bindata) ReadUp(version uint) (r io.ReadCloser, identifier string, err
104104
}
105105
return ioutil.NopCloser(bytes.NewReader(body)), m.Identifier, nil
106106
}
107-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), b.path, os.ErrNotExist}
107+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: b.path, Err: os.ErrNotExist}
108108
}
109109

110110
func (b *Bindata) ReadDown(version uint) (r io.ReadCloser, identifier string, err error) {
@@ -115,5 +115,5 @@ func (b *Bindata) ReadDown(version uint) (r io.ReadCloser, identifier string, er
115115
}
116116
return ioutil.NopCloser(bytes.NewReader(body)), m.Identifier, nil
117117
}
118-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), b.path, os.ErrNotExist}
118+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: b.path, Err: os.ErrNotExist}
119119
}

‎source/godoc_vfs/vfs.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (b *VFS) Close() error {
8383
func (b *VFS) First() (version uint, err error) {
8484
v, ok := b.migrations.First()
8585
if !ok {
86-
return 0, &os.PathError{"first", "<vfs>://" + b.path, os.ErrNotExist}
86+
return 0, &os.PathError{Op: "first", Path: "<vfs>://" + b.path, Err: os.ErrNotExist}
8787
}
8888
return v, nil
8989
}
@@ -93,7 +93,7 @@ func (b *VFS) First() (version uint, err error) {
9393
func (b *VFS) Prev(version uint) (prevVersion uint, err error) {
9494
v, ok := b.migrations.Prev(version)
9595
if !ok {
96-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), "<vfs>://" + b.path, os.ErrNotExist}
96+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: "<vfs>://" + b.path, Err: os.ErrNotExist}
9797
}
9898
return v, nil
9999
}
@@ -103,7 +103,7 @@ func (b *VFS) Prev(version uint) (prevVersion uint, err error) {
103103
func (b *VFS) Next(version uint) (nextVersion uint, err error) {
104104
v, ok := b.migrations.Next(version)
105105
if !ok {
106-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), "<vfs>://" + b.path, os.ErrNotExist}
106+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: "<vfs>://" + b.path, Err: os.ErrNotExist}
107107
}
108108
return v, nil
109109
}
@@ -120,7 +120,7 @@ func (b *VFS) ReadUp(version uint) (r io.ReadCloser, identifier string, err erro
120120
}
121121
return ioutil.NopCloser(bytes.NewReader(body)), m.Identifier, nil
122122
}
123-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), "<vfs>://" + b.path, os.ErrNotExist}
123+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: "<vfs>://" + b.path, Err: os.ErrNotExist}
124124
}
125125

126126
// ReadDown returns the down migration body and an identifier that helps with
@@ -133,5 +133,5 @@ func (b *VFS) ReadDown(version uint) (r io.ReadCloser, identifier string, err er
133133
}
134134
return ioutil.NopCloser(bytes.NewReader(body)), m.Identifier, nil
135135
}
136-
return nil, "", &os.PathError{fmt.Sprintf("read version %v", version), "<vfs>://" + b.path, os.ErrNotExist}
136+
return nil, "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: "<vfs>://" + b.path, Err: os.ErrNotExist}
137137
}

‎source/stub/stub.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@ func (s *Stub) Close() error {
4848

4949
func (s *Stub) First() (version uint, err error) {
5050
if v, ok := s.Migrations.First(); !ok {
51-
return 0, &os.PathError{"first", s.Url, os.ErrNotExist} // TODO: s.Url can be empty when called with WithInstance
51+
return 0, &os.PathError{Op: "first", Path: s.Url, Err: os.ErrNotExist} // TODO: s.Url can be empty when called with WithInstance
5252
} else {
5353
return v, nil
5454
}
5555
}
5656

5757
func (s *Stub) Prev(version uint) (prevVersion uint, err error) {
5858
if v, ok := s.Migrations.Prev(version); !ok {
59-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), s.Url, os.ErrNotExist}
59+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: s.Url, Err: os.ErrNotExist}
6060
} else {
6161
return v, nil
6262
}
6363
}
6464

6565
func (s *Stub) Next(version uint) (nextVersion uint, err error) {
6666
if v, ok := s.Migrations.Next(version); !ok {
67-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), s.Url, os.ErrNotExist}
67+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: s.Url, Err: os.ErrNotExist}
6868
} else {
6969
return v, nil
7070
}
@@ -74,12 +74,12 @@ func (s *Stub) ReadUp(version uint) (r io.ReadCloser, identifier string, err err
7474
if m, ok := s.Migrations.Up(version); ok {
7575
return ioutil.NopCloser(bytes.NewBufferString(m.Identifier)), fmt.Sprintf("%v.up.stub", version), nil
7676
}
77-
return nil, "", &os.PathError{fmt.Sprintf("read up version %v", version), s.Url, os.ErrNotExist}
77+
return nil, "", &os.PathError{Op: fmt.Sprintf("read up version %v", version), Path: s.Url, Err: os.ErrNotExist}
7878
}
7979

8080
func (s *Stub) ReadDown(version uint) (r io.ReadCloser, identifier string, err error) {
8181
if m, ok := s.Migrations.Down(version); ok {
8282
return ioutil.NopCloser(bytes.NewBufferString(m.Identifier)), fmt.Sprintf("%v.down.stub", version), nil
8383
}
84-
return nil, "", &os.PathError{fmt.Sprintf("read down version %v", version), s.Url, os.ErrNotExist}
84+
return nil, "", &os.PathError{Op: fmt.Sprintf("read down version %v", version), Path: s.Url, Err: os.ErrNotExist}
8585
}

0 commit comments

Comments
 (0)