all: Make all error implementations pointer types (#6726)

This matches the convention of the stdlib and avoids ambiguity: when
customErr{} and &customErr{} both implement error, client code needs to
check for both.

Memory use should remain the same, since storing a non-pointer type in
an interface value still copies the value to the heap.
This commit is contained in:
greatroar
2020-06-16 09:27:34 +02:00
committed by GitHub
parent a47546a1f1
commit df83b84aa1
12 changed files with 36 additions and 48 deletions
+3 -4
View File
@@ -5,7 +5,6 @@ package client
import (
"context"
"crypto/tls"
"errors"
"fmt"
"net"
"net/url"
@@ -22,7 +21,7 @@ type incorrectResponseCodeErr struct {
msg string
}
func (e incorrectResponseCodeErr) Error() string {
func (e *incorrectResponseCodeErr) Error() string {
return fmt.Sprintf("incorrect response code %d: %s", e.code, e.msg)
}
@@ -62,7 +61,7 @@ func GetInvitationFromRelay(ctx context.Context, uri *url.URL, id syncthingproto
switch msg := message.(type) {
case protocol.Response:
return protocol.SessionInvitation{}, incorrectResponseCodeErr{msg.Code, msg.Message}
return protocol.SessionInvitation{}, &incorrectResponseCodeErr{msg.Code, msg.Message}
case protocol.SessionInvitation:
l.Debugln("Received invitation", msg, "via", conn.LocalAddr())
ip := net.IP(msg.Address)
@@ -132,7 +131,7 @@ func TestRelay(ctx context.Context, uri *url.URL, certs []tls.Certificate, sleep
if err == nil {
return nil
}
if !errors.As(err, &incorrectResponseCodeErr{}) {
if _, ok := err.(*incorrectResponseCodeErr); !ok {
return fmt.Errorf("getting invitation: %w", err)
}
time.Sleep(sleep)
+1 -1
View File
@@ -201,7 +201,7 @@ func (c *staticClient) join() error {
switch msg := message.(type) {
case protocol.Response:
if msg.Code != 0 {
return incorrectResponseCodeErr{msg.Code, msg.Message}
return &incorrectResponseCodeErr{msg.Code, msg.Message}
}
case protocol.RelayFull: