From f9fff4554c7ac2c9fa51150d57b163132338b51b Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Fri, 9 Nov 2018 23:28:54 +0300 Subject: [PATCH] go/build, go/doc: fix tautological conditions These issues were found by the new vet's nilness check. The variables were already checked against nil, so remove extra checks. Change-Id: Ie252ccfcc755f3d06f691f354bf13d5a623fe17b Reviewed-on: https://go-review.googlesource.com/c/148937 Reviewed-by: Robert Griesemer Run-TryBot: Robert Griesemer TryBot-Result: Gobot Gobot --- src/go/build/read_test.go | 2 +- src/go/doc/reader.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/go/build/read_test.go b/src/go/build/read_test.go index 9cef657e13..2a36a012d5 100644 --- a/src/go/build/read_test.go +++ b/src/go/build/read_test.go @@ -118,7 +118,7 @@ func testRead(t *testing.T, tests []readTest, read func(io.Reader) ([]byte, erro } continue } - if err == nil && tt.err != "" { + if tt.err != "" { t.Errorf("#%d: success, expected %q", i, tt.err) continue } diff --git a/src/go/doc/reader.go b/src/go/doc/reader.go index 26365e46b5..4950e7c6c3 100644 --- a/src/go/doc/reader.go +++ b/src/go/doc/reader.go @@ -81,7 +81,7 @@ func (mset methodSet) add(m *Func) { mset[m.Name] = m return } - if old != nil && m.Level == old.Level { + if m.Level == old.Level { // conflict - mark it using a method with nil Decl mset[m.Name] = &Func{ Name: m.Name, -- 2.50.0