Address staticcheck errors

borkshop · Dec 29, 2017 · db66435 · db66435
1 parent de89cbf
commit db66435
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 9 deletions.
diff --git a/internal/cops/display/cursor.go b/internal/cops/display/cursor.go
@@ -109,6 +109,9 @@ func (c Cursor) Reset(buf []byte) ([]byte, Cursor) {
 		c.Foreground = Colors[7]
 		c.Background = Colors[0]
 		buf = append(buf, "\033[m"...)
+		// Adding this superfluous return worked around staticcheck SA4005:
+		// ineffective assignment to Foreground/Background
+		return buf, c
 	}
 	return buf, c
 }

diff --git a/internal/cops/examples/borkart/main.go b/internal/cops/examples/borkart/main.go
@@ -116,6 +116,5 @@ Loop:
 	if err != nil {
 		return err
 	}
-	buf = buf[0:0]
 	return err
 }
diff --git a/internal/cops/examples/braillewave/main.go b/internal/cops/examples/braillewave/main.go
@@ -93,7 +93,6 @@ Loop:
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
 	_, err = os.Stdout.Write(buf)
-	buf = buf[0:0]
 
 	return err
 }
diff --git a/internal/cops/examples/earthgif/earthgif.go b/internal/cops/examples/earthgif/earthgif.go
@@ -110,7 +110,6 @@ Loop:
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
 	_, err = os.Stdout.Write(buf)
-	buf = buf[0:0]
 
 	return err
 }

diff --git a/internal/cops/examples/hicops/hicops.go b/internal/cops/examples/hicops/hicops.go
@@ -72,7 +72,6 @@ func run() (err error) {
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
 	_, err = os.Stdout.Write(buf)
-	buf = buf[0:0]
 
 	return err
 }
diff --git a/internal/cops/examples/vt/main.go b/internal/cops/examples/vt/main.go
@@ -95,7 +95,6 @@ DrawLoop:
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
 	_, err = os.Stdout.Write(buf)
-	buf = buf[0:0]
 
 	return err
 }
diff --git a/internal/perf/perf.go b/internal/perf/perf.go
@@ -143,7 +143,7 @@ func (perf *Perf) stopProfiling() (err error) {
 	}
 	perf.shouldProfile = false
 	perf.profiling = false
-	return nil
+	return err
 }
 
 func (perf *Perf) takeProfile() error {

diff --git a/proofs/deathroom/main.go b/proofs/deathroom/main.go
@@ -298,7 +298,7 @@ func (w *world) processRest() {
 		move, ent := cur.R(), cur.A()
 		if n := w.moves.Mag(move); ent.Type().HasAll(wcBody) && n >= maxRestingCharge {
 			w.moves.SetMag(move, n)
-			n = w.heal(ent, n)
+			_ = w.heal(ent, n)
 		}
 	}
 }

diff --git a/proofs/showroom/main.go b/proofs/showroom/main.go
@@ -40,7 +40,7 @@ func run() (rerr error) {
 	commands, mute := input.Channel(os.Stdin)
 	defer mute()
 
-	sigwinch := make(chan os.Signal)
+	sigwinch := make(chan os.Signal, 1)
 	signal.Notify(sigwinch, syscall.SIGWINCH)
 
 	world := newWorld()

diff --git a/proofs/splash/main.go b/proofs/splash/main.go
@@ -48,7 +48,7 @@ func run() (rerr error) {
 	commands, mute := input.Channel(os.Stdin)
 	defer mute()
 
-	sigwinch := make(chan os.Signal)
+	sigwinch := make(chan os.Signal, 1)
 	signal.Notify(sigwinch, syscall.SIGWINCH)
 
 	ticker := time.NewTicker(time.Second / 60)