Resolve some more, sensible staticcheck suggestions

mat · Oct 3, 2024 · 8d4f471 · 8d4f471
1 parent 0940eb6
commit 8d4f471
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/besticon/iconserver/server_test.go b/besticon/iconserver/server_test.go
@@ -272,12 +272,6 @@ func assertStringEquals(t *testing.T, expected string, actual string) {
 	}
 }
 
-func assertIntegerEquals(t *testing.T, expected int, actual int) {
-	if expected != actual {
-		fail(t, fmt.Sprintf("Expected %d to be %d", actual, expected))
-	}
-}
-
 func assertIntegerInInterval(t *testing.T, lower int, upper int, actual int) {
 	if actual < lower || actual > upper {
 		fail(t, fmt.Sprintf("Expected %d to be in interval [%d,%d]", actual, lower, upper))

diff --git a/ico/ico.go b/ico/ico.go
@@ -87,12 +87,6 @@ func parseIcondirEntry(r io.Reader, e *icondirEntry) error {
 	return nil
 }
 
-type dibHeader struct {
-	dibHeaderSize uint32
-	width         uint32
-	height        uint32
-}
-
 func (e *icondirEntry) ColorCount() int {
 	if e.PaletteCount == 0 {
 		return 256

diff --git a/lettericon/lettericon.go b/lettericon/lettericon.go
@@ -37,7 +37,7 @@ func RenderPNG(letter string, bgColor color.Color, width int, out io.Writer) err
 	fg := pickForegroundColor(bgColor)
 
 	rgba := image.NewRGBA(image.Rect(0, 0, width, width))
-	draw.Draw(rgba, rgba.Bounds(), &image.Uniform{bgColor}, image.ZP, draw.Src)
+	draw.Draw(rgba, rgba.Bounds(), &image.Uniform{bgColor}, image.Point{}, draw.Src)
 
 	fontSize := fontSizeFactor * float64(width)
 	d := &font.Drawer{

diff --git a/lettericon/lettericon_test.go b/lettericon/lettericon_test.go
@@ -67,7 +67,7 @@ func assertCorrectPNGData(t *testing.T, letter string, width int, hexColor strin
 	}
 
 	// "A-144-123456.png"
-	testdataDir := fmt.Sprintf("testdata/")
+	testdataDir := "testdata/"
 	file := fmt.Sprintf(testdataDir+"%s-%d-%s.png", letter, width, hexColor)
 	fileData, err := bytesFromFile(file)
 	if err != nil {
@@ -88,7 +88,7 @@ func assertCorrectSVGData(t *testing.T, letter string, hexColor string) {
 	imageData := b.Bytes()
 
 	// "A-144-123456.png"
-	testdataDir := fmt.Sprintf("testdata/")
+	testdataDir := "testdata/"
 	file := fmt.Sprintf(testdataDir+"%s-%s.svg", letter, hexColor)
 	fileData, err := bytesFromFile(file)
 	if err != nil {

diff --git a/vcr/vcr.go b/vcr/vcr.go
@@ -88,7 +88,7 @@ func logResponse(w io.Writer, res *http.Response, body bool) {
 const recordSeparator string = "*************vcr*************\n"
 
 func logSeparator(w io.Writer) {
-	fmt.Fprintf(w, recordSeparator)
+	fmt.Fprint(w, recordSeparator)
 }
 
 var defaultTransport = &http.Transport{}
@@ -147,7 +147,7 @@ func NewReplayerTransport(reader io.Reader) (*replayerTransport, error) {
 	r := bufio.NewReader(bytes.NewReader(conversation))
 
 	i := 0
-	for true {
+	for {
 		i++
 		//		fmt.Printf("Reading Request %d\n", i)
 		req, err := http.ReadRequest(r)
@@ -173,7 +173,7 @@ func NewReplayerTransport(reader io.Reader) (*replayerTransport, error) {
 		}
 
 		bodyBytes := []byte{}
-		for true {
+		for {
 			line, err := r.ReadBytes('\n')
 			separatorReached := strings.HasSuffix(string(line), recordSeparator)
 			if separatorReached {