Fixes to make gometalinter happier

Author: markus-wa

demoinfocs_test.go

@@ -31,10 +31,10 @@ func init() {
 
 func TestDemoInfoCs(t *testing.T) {
 	f, err := os.Open(defaultDemPath)
-	defer f.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer f.Close()
 
 	p := dem.NewParser(f, dem.WarnToStdErr)
 
@@ -135,10 +135,10 @@ func TestDemoInfoCs(t *testing.T) {
 
 func TestUnexpectedEndOfDemo(t *testing.T) {
 	f, err := os.Open(unexpectedEndOfDemoPath)
-	defer f.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer f.Close()
 
 	p := dem.NewParser(f, nil)
 	_, err = p.ParseHeader()
@@ -154,10 +154,10 @@ func TestUnexpectedEndOfDemo(t *testing.T) {
 
 func TestCancelParseToEnd(t *testing.T) {
 	f, err := os.Open(defaultDemPath)
-	defer f.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer f.Close()
 
 	p := dem.NewParser(f, nil)
 	_, err = p.ParseHeader()
@@ -236,10 +236,10 @@ func TestDemoSet(t *testing.T) {
 			func() {
 				var f *os.File
 				f, err = os.Open(demSetPath + "/" + name)
-				defer f.Close()
 				if err != nil {
 					t.Error(err)
 				}
+				defer f.Close()
 
 				defer func() {
 					pErr := recover()
@@ -269,10 +269,10 @@ func BenchmarkDemoInfoCs(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		func() {
 			f, err := os.Open(defaultDemPath)
-			defer f.Close()
 			if err != nil {
 				b.Fatal(err)
 			}
+			defer f.Close()
 
 			p := dem.NewParser(f, nil)
 
@@ -295,10 +295,10 @@ func BenchmarkDemoInfoCs(b *testing.B) {
 
 func BenchmarkInMemory(b *testing.B) {
 	f, err := os.Open(defaultDemPath)
-	defer f.Close()
 	if err != nil {
 		b.Fatal(err)
 	}
+	defer f.Close()
 
 	inf, err := f.Stat()
 	if err != nil {

demopacket.go

@@ -9,7 +9,7 @@ import (
 	msg "github.com/markus-wa/demoinfocs-golang/msg"
 )
 
-var byteSlicePool sync.Pool = sync.Pool{
+var byteSlicePool = sync.Pool{
 	New: func() interface{} {
 		s := make([]byte, 0, 256)
 		return &s

entities.go

@@ -32,9 +32,8 @@ func (p *Parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
 			// Could do weird stuff with event handlers otherwise
 			p.entities[currentEntity] = nil
 
-			if r.ReadBit() {
-				// TODO: Force Delete??
-			}
+			// TODO: Force Delete if this is true??
+			r.ReadBit()
 		} else {
 			if r.ReadBit() {
 				// Enter PVS
@@ -62,7 +61,7 @@ func (p *Parser) readEnterPVS(reader *bit.BitReader, entityID int) *st.Entity {
 			newEntity.Props()[idx].FirePropertyUpdate(val)
 		}
 	} else {
-		ppBase := make(map[int]st.PropValue, 0)
+		ppBase := make(map[int]st.PropValue)
 		if p.instanceBaselines[scID] != nil {
 			newEntity.CollectProperties(&ppBase)
 			r := bit.NewSmallBitReader(bytes.NewReader(p.instanceBaselines[scID]))

example_test.go

@@ -13,10 +13,10 @@ import (
 // Make sure the example from the README.md compiles and runs.
 func TestExample(t *testing.T) {
 	f, err := os.Open(defaultDemPath)
-	defer f.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer f.Close()
 
 	p := dem.NewParser(f, dem.WarnToStdErr)
 

parser.go

@@ -55,9 +55,8 @@ type bombsite struct {
 }
 
 type boundingBoxInformation struct {
-	index int
-	min   r3.Vector
-	max   r3.Vector
+	min r3.Vector
+	max r3.Vector
 }
 
 func (bbi boundingBoxInformation) contains(point r3.Vector) bool {

parsing.go

@@ -55,11 +55,11 @@ func (p *Parser) ParseHeader() (common.DemoHeader, error) {
 // Parsing errors
 var (
 	// ErrCancelled signals that parsing was cancelled via Parser.Cancel()
-	ErrCancelled error = errors.New("Parsing was cancelled before it finished (ErrCancelled)")
+	ErrCancelled = errors.New("Parsing was cancelled before it finished (ErrCancelled)")
 
 	// ErrUnexpectedEndOfDemo signals that the demo is incomplete / corrupt -
 	// these demos may still be useful, check the how far the parser got.
-	ErrUnexpectedEndOfDemo error = errors.New("Demo stream ended unexpectedly (ErrUnexpectedEndOfDemo)")
+	ErrUnexpectedEndOfDemo = errors.New("Demo stream ended unexpectedly (ErrUnexpectedEndOfDemo)")
 )
 
 // ParseToEnd attempts to parse the demo until the end.