Skip to content

Commit bc70d31

Browse files
authored
refactor: fix revive.indent-error-flow lint issues (#1896)
1 parent f6ba4ab commit bc70d31

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ linters-settings:
6565
revive:
6666
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
6767
rules:
68+
- name: indent-error-flow
6869
- name: use-any
6970
lll:
7071
line-length: 130

client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3060,9 +3060,8 @@ func (t *transport) RoundTrip(hc *HostClient, req *Request, resp *Response) (ret
30603060
return nil
30613061
})
30623062
return false, nil
3063-
} else {
3064-
hc.releaseReader(br)
30653063
}
3064+
hc.releaseReader(br)
30663065

30673066
if closeConn {
30683067
hc.closeConn(cc)

http.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,9 +1590,8 @@ func (req *Request) Write(w *bufio.Writer) error {
15901590
if len(req.Header.Host()) == 0 {
15911591
if len(host) == 0 {
15921592
return errRequestHostRequired
1593-
} else {
1594-
req.Header.SetHostBytes(host)
15951593
}
1594+
req.Header.SetHostBytes(host)
15961595
} else if !req.UseHostHeader {
15971596
req.Header.SetHostBytes(host)
15981597
}

uri.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@ func (u *URI) parse(host, uri []byte, isTLS bool) error {
312312
}
313313

314314
u.host = append(u.host, host...)
315-
if parsedHost, err := parseHost(u.host); err != nil {
315+
parsedHost, err := parseHost(u.host)
316+
if err != nil {
316317
return err
317-
} else {
318-
u.host = parsedHost
319318
}
319+
u.host = parsedHost
320320
lowercaseBytes(u.host)
321321

322322
b := uri

0 commit comments

Comments
 (0)