NO-JIRA: [go] Clean up warnings from `go vet -shadow`
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/674e023f Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/674e023f Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/674e023f Branch: refs/heads/master Commit: 674e023f087797fd5d0e3e9fa228a7a02f21dd46 Parents: c36a1a7 Author: Alan Conway <acon...@redhat.com> Authored: Thu Oct 11 18:56:23 2018 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Tue Oct 23 20:04:07 2018 -0400 ---------------------------------------------------------------------- go/src/qpid.apache.org/amqp/interop_test.go | 11 +++++++---- go/src/qpid.apache.org/amqp/marshal_test.go | 14 +++++++------- go/src/qpid.apache.org/amqp/message_test.go | 17 +++++++++-------- go/src/qpid.apache.org/electron/benchmark_test.go | 12 ++++++------ go/src/qpid.apache.org/electron/electron_test.go | 4 ++-- go/src/qpid.apache.org/electron/session.go | 12 ++++++------ go/src/qpid.apache.org/proton/message.go | 14 +++++++------- 7 files changed, 44 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/amqp/interop_test.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/amqp/interop_test.go b/go/src/qpid.apache.org/amqp/interop_test.go index 8ec6734..0d9d204 100644 --- a/go/src/qpid.apache.org/amqp/interop_test.go +++ b/go/src/qpid.apache.org/amqp/interop_test.go @@ -81,7 +81,8 @@ func checkDecode(d *Decoder, want interface{}, gotPtr interface{}, t *testing.T) t.Error("Unmarshal failed", err) return } - if err := checkEqual(n, len(bytes)); err != nil { + err = checkEqual(n, len(bytes)) + if err != nil { t.Error("Bad unmarshal length", err) return } @@ -246,8 +247,10 @@ func TestStrings(t *testing.T) { if !strings.Contains(err.Error(), "cannot unmarshal") { t.Error(err) } - _, err = Unmarshal([]byte{}, nil) - if err := checkEqual(err, EndOfData); err != nil { + if _, err = Unmarshal([]byte{}, nil); err != nil { + t.Error(err) + } + if err = checkEqual(err, EndOfData); err != nil { t.Error(err) } _, err = Unmarshal([]byte("foobar"), nil) @@ -365,7 +368,7 @@ func TODO_TestMessage(t *testing.T) { if err != nil { t.Fatal(err) } else { - if err := checkEqual(m.Body(), "hello"); err != nil { + if err = checkEqual(m.Body(), "hello"); err != nil { t.Error(err) } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/amqp/marshal_test.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/amqp/marshal_test.go b/go/src/qpid.apache.org/amqp/marshal_test.go index b1d1225..c489365 100644 --- a/go/src/qpid.apache.org/amqp/marshal_test.go +++ b/go/src/qpid.apache.org/amqp/marshal_test.go @@ -125,7 +125,7 @@ func TestAnyMap(t *testing.T) { t.Error(err) } var out AnyMap - if _, err := Unmarshal(bytes, &out); err != nil { + if _, err = Unmarshal(bytes, &out); err != nil { t.Error(err) } if err = checkEqual(AnyMap(nil), out); err != nil { @@ -137,7 +137,7 @@ func TestAnyMap(t *testing.T) { if err != nil { t.Error(err) } - if _, err := Unmarshal(bytes, &out); err != nil { + if _, err = Unmarshal(bytes, &out); err != nil { t.Error(err) } if err = checkEqual(AnyMap(nil), out); err != nil { @@ -150,7 +150,7 @@ func TestAnyMap(t *testing.T) { if err != nil { t.Error(err) } - if _, err := Unmarshal(bytes, &out); err != nil { + if _, err = Unmarshal(bytes, &out); err != nil { t.Error(err) } if err = checkEqual(in, out); err != nil { @@ -167,7 +167,7 @@ func TestBadMap(t *testing.T) { } m := Map{} // Should fail to unmarshal to a map - if _, err := Unmarshal(bytes, &m); err != nil { + if _, err = Unmarshal(bytes, &m); err != nil { if !strings.Contains(err.Error(), "key []string{\"x\", \"y\"} is not comparable") { t.Error(err) } @@ -176,14 +176,14 @@ func TestBadMap(t *testing.T) { } // Should unmarshal to an AnyMap var out AnyMap - if _, err := Unmarshal(bytes, &out); err != nil { + if _, err = Unmarshal(bytes, &out); err != nil { t.Error(err) } else if err = checkEqual(in, out); err != nil { t.Error(err) } // Should unmarshal to interface{} as AnyMap var v interface{} - if _, err := Unmarshal(bytes, &v); err != nil { + if _, err = Unmarshal(bytes, &v); err != nil { t.Error(err) } else if err = checkEqual(in, v); err != nil { t.Error(err) @@ -195,7 +195,7 @@ func TestBadMap(t *testing.T) { t.Error(err) } v = nil - if _, err := Unmarshal(bytes, &v); err != nil { + if _, err = Unmarshal(bytes, &v); err != nil { t.Error(err) } else if err = checkEqual(in, v); err != nil { t.Error(err) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/amqp/message_test.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/amqp/message_test.go b/go/src/qpid.apache.org/amqp/message_test.go index 668ca49..321a9a0 100644 --- a/go/src/qpid.apache.org/amqp/message_test.go +++ b/go/src/qpid.apache.org/amqp/message_test.go @@ -26,13 +26,15 @@ import ( ) func roundTrip(m Message) error { - var err error - if buffer, err := m.Encode(nil); err == nil { - if m2, err := DecodeMessage(buffer); err == nil { - err = checkEqual(m, m2) - } + buffer, err := m.Encode(nil) + if err != nil { + return err } - return err + m2, err := DecodeMessage(buffer) + if err != nil { + return err + } + return checkEqual(m, m2) } func TestDefaultMessage(t *testing.T) { @@ -265,10 +267,9 @@ func BenchmarkNewMessageAll(b *testing.B) { func BenchmarkEncode(b *testing.B) { m := setMessageProperties(NewMessageWith("hello")) - var buf []byte b.ResetTimer() for n := 0; n < b.N; n++ { - buf, err := m.Encode(buf) + buf, err := m.Encode(nil) if err != nil { b.Fatal(err) } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/electron/benchmark_test.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/electron/benchmark_test.go b/go/src/qpid.apache.org/electron/benchmark_test.go index ae9d47c..0de53d8 100644 --- a/go/src/qpid.apache.org/electron/benchmark_test.go +++ b/go/src/qpid.apache.org/electron/benchmark_test.go @@ -42,7 +42,7 @@ type bmCommon struct { done sync.WaitGroup } -func makeBmCommon(p *pair, waitCount int) bmCommon { +func newBmCommon(p *pair, waitCount int) *bmCommon { bm := bmCommon{p: p, b: p.t.(*testing.B)} bm.p.capacity = *capacity bm.p.prefetch = true @@ -50,7 +50,7 @@ func makeBmCommon(p *pair, waitCount int) bmCommon { bm.ack = make(chan Outcome, *capacity) bm.done.Add(waitCount) bm.b.ResetTimer() - return bm + return &bm } func (bm *bmCommon) receiveAccept() { @@ -74,7 +74,7 @@ func (bm *bmCommon) outcomes() { var emptyMsg = amqp.NewMessage() func BenchmarkSendForget(b *testing.B) { - bm := makeBmCommon(newPipe(b, nil, nil), 1) + bm := newBmCommon(newPipe(b, nil, nil), 1) defer bm.p.close() go func() { // Receive, no ack @@ -93,7 +93,7 @@ func BenchmarkSendForget(b *testing.B) { } func BenchmarkSendSync(b *testing.B) { - bm := makeBmCommon(newPipe(b, nil, nil), 1) + bm := newBmCommon(newPipe(b, nil, nil), 1) defer bm.p.close() go bm.receiveAccept() @@ -104,7 +104,7 @@ func BenchmarkSendSync(b *testing.B) { } func BenchmarkSendAsync(b *testing.B) { - bm := makeBmCommon(newPipe(b, nil, nil), 2) + bm := newBmCommon(newPipe(b, nil, nil), 2) defer bm.p.close() go bm.outcomes() // Handle outcomes @@ -118,7 +118,7 @@ func BenchmarkSendAsync(b *testing.B) { // Create a new message for each send, with body and property. func BenchmarkSendAsyncNewMessage(b *testing.B) { body := strings.Repeat("x", *bodySize) - bm := makeBmCommon(newPipe(b, nil, nil), 2) + bm := newBmCommon(newPipe(b, nil, nil), 2) defer bm.p.close() go bm.outcomes() // Handle outcomes http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/electron/electron_test.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/electron/electron_test.go b/go/src/qpid.apache.org/electron/electron_test.go index a648a18..2517de1 100644 --- a/go/src/qpid.apache.org/electron/electron_test.go +++ b/go/src/qpid.apache.org/electron/electron_test.go @@ -70,7 +70,7 @@ func TestClientSender(t *testing.T) { } // Server send ack - if err := rm.Reject(); err != nil { + if err = rm.Reject(); err != nil { t.Error(err) } // Client get ack. @@ -139,7 +139,7 @@ func TestTimeouts(t *testing.T) { if err != nil { t.Fatal(err) } - if err := rm.Accept(); err != nil { + if err = rm.Accept(); err != nil { t.Fatal(err) } // Sender get ack http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/electron/session.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/electron/session.go b/go/src/qpid.apache.org/electron/session.go index 6dae354..7dc6030 100644 --- a/go/src/qpid.apache.org/electron/session.go +++ b/go/src/qpid.apache.org/electron/session.go @@ -89,11 +89,11 @@ func (s *session) Sender(setting ...LinkOption) (snd Sender, err error) { if s.Error() != nil { return s.Error() } - l, err := makeLocalLink(s, true, setting...) - if err == nil { + l, err2 := makeLocalLink(s, true, setting...) + if err2 == nil { snd = newSender(l) } - return err + return err2 }) return } @@ -103,11 +103,11 @@ func (s *session) Receiver(setting ...LinkOption) (rcv Receiver, err error) { if s.Error() != nil { return s.Error() } - l, err := makeLocalLink(s, false, setting...) - if err == nil { + l, err2 := makeLocalLink(s, false, setting...) + if err2 == nil { rcv = newReceiver(l) } - return err + return err2 }) return } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/674e023f/go/src/qpid.apache.org/proton/message.go ---------------------------------------------------------------------- diff --git a/go/src/qpid.apache.org/proton/message.go b/go/src/qpid.apache.org/proton/message.go index 7c166a5..1f8ebe5 100644 --- a/go/src/qpid.apache.org/proton/message.go +++ b/go/src/qpid.apache.org/proton/message.go @@ -44,7 +44,8 @@ func (d Delivery) HasMessage() bool { return !d.IsNil() && d.Readable() && !d.Pa // Will return an error if message is incomplete or not current. func (delivery Delivery) Message() (amqp.Message, error) { var err error - if bytes, err := delivery.MessageBytes(); err == nil { + bytes, err := delivery.MessageBytes() + if err == nil { m := amqp.NewMessage() err = m.Decode(bytes) return m, err @@ -83,13 +84,12 @@ func nextTag() string { // Send sends a amqp.Message over a Link. // Returns a Delivery that can be use to determine the outcome of the message. func (link Link) Send(m amqp.Message) (Delivery, error) { - var err error - if bytes, err := m.Encode(nil); err == nil { - if d, err := link.SendMessageBytes(bytes); err == nil { - return d, err - } + bytes, err := m.Encode(nil) + if err != nil { + return Delivery{}, err } - return Delivery{}, err + d, err := link.SendMessageBytes(bytes) + return d, err } // SendMessageBytes sends encoded bytes of an amqp.Message over a Link. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
