From fbc8973a6bc88b50509ea738f475b36ef756bf90 Mon Sep 17 00:00:00 2001 From: Daniel Martí Date: Mon, 21 Aug 2017 22:23:14 +0200 Subject: all: join some chained ifs to unindent code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found with mvdan.cc/unindent. It skipped the cases where parentheses would need to be added, where comments would have to be moved elsewhere, or where actions and simple logic would mix. One of them was of the form "err != nil && err == io.EOF", so the first part was removed. Change-Id: Ie504c2b03a2c87d10ecbca1b9270069be1171b91 Reviewed-on: https://go-review.googlesource.com/57690 Run-TryBot: Daniel Martí TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/encoding/gob/decoder.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/encoding') diff --git a/src/encoding/gob/decoder.go b/src/encoding/gob/decoder.go index 9398b8f243..5ef0388862 100644 --- a/src/encoding/gob/decoder.go +++ b/src/encoding/gob/decoder.go @@ -99,10 +99,8 @@ func (dec *Decoder) readMessage(nbytes int) { // Read the data dec.buf.Size(nbytes) _, dec.err = io.ReadFull(dec.r, dec.buf.Bytes()) - if dec.err != nil { - if dec.err == io.EOF { - dec.err = io.ErrUnexpectedEOF - } + if dec.err == io.EOF { + dec.err = io.ErrUnexpectedEOF } } -- cgit v1.3