fix: Linters

obalunenko · Nov 25, 2024 · 63fe4e8 · 63fe4e8
1 parent 8b814e8
commit 63fe4e8
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 111 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -98,6 +98,8 @@ linters-settings:
     # ).
     # Run `GL_DEBUG=govet golangci-lint run --enable=govet` to see default, all available analyzers, and enabled analyzers.
     # Default: []
+    disable:
+      - fieldalignment
     enable:
       # Check for missing values after append.
       - appends
@@ -127,8 +129,6 @@ linters-settings:
       - directive
       # Report passing non-pointer or non-error values to errors.As.
       - errorsas
-      # Find structs that would use less memory if their fields were sorted.
-      - fieldalignment
       # Find calls to a particular function.
       - findcall
       # Report assembly that clobbers the frame pointer before saving it.

diff --git a/cmd/aoc-cli/handlers.go b/cmd/aoc-cli/handlers.go
@@ -21,7 +21,7 @@ import (
 )
 
 func onExit(_ context.Context) cli.AfterFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		fmt.Println("Exit...")
 
 		return nil

diff --git a/internal/command/command_test.go b/internal/command/command_test.go
@@ -34,10 +34,10 @@ func newMockHTTPClient(p returnParams) *mockHTTPClient {
 			return &http.Response{
 				Status:           http.StatusText(p.status),
 				StatusCode:       p.status,
-				Proto:            "HTTP/1.0",
-				ProtoMajor:       1,
-				ProtoMinor:       0,
-				Header:           nil,
+				Proto:            req.Proto,
+				ProtoMajor:       req.ProtoMajor,
+				ProtoMinor:       req.ProtoMinor,
+				Header:           req.Header,
 				Body:             p.body,
 				ContentLength:    0,
 				TransferEncoding: nil,

diff --git a/internal/puzzles/common/intcomputer/intcoumputer_test.go b/internal/puzzles/common/intcomputer/intcoumputer_test.go
@@ -47,8 +47,6 @@ func Test_New(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := New(tt.args.input)
 			if tt.wantErr {
@@ -116,8 +114,6 @@ func Test_computer_add(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			err := tt.c.add(tt.args.aPos, tt.args.bPos, tt.args.resPos)
 			require.NoError(t, err)
@@ -163,8 +159,6 @@ func Test_computer_mult(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			err := tt.c.mult(tt.args.aPos, tt.args.bPos, tt.args.resPos)
 			require.NoError(t, err)
@@ -195,8 +189,6 @@ func Test_computer_Execute(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			comp := tt.c
 			got, err := comp.Execute()
@@ -233,8 +225,6 @@ func Test_computer_Input(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			comp := tt.c
 			comp.Input(tt.args.noun, tt.args.verb)

diff --git a/internal/puzzles/input/content_test.go b/internal/puzzles/input/content_test.go
@@ -34,10 +34,10 @@ func newMockHTTPClient(p returnParams) *mockHTTPClient {
 			return &http.Response{
 				Status:           http.StatusText(p.status),
 				StatusCode:       p.status,
-				Proto:            "HTTP/1.0",
+				Proto:            req.Proto,
 				ProtoMajor:       1,
-				ProtoMinor:       0,
-				Header:           nil,
+				ProtoMinor:       req.ProtoMinor,
+				Header:           req.Header,
 				Body:             p.body,
 				ContentLength:    0,
 				TransferEncoding: nil,
@@ -173,7 +173,7 @@ func TestGet(t *testing.T) {
 			name: "",
 			client: client{
 				IHTTPClient: &mockHTTPClient{
-					MockDo: func(req *http.Request) (*http.Response, error) {
+					MockDo: func(_ *http.Request) (*http.Response, error) {
 						return &http.Response{}, errors.New("error in test")
 					},
 				},

diff --git a/internal/puzzles/name_test.go b/internal/puzzles/name_test.go
@@ -49,16 +49,16 @@ func TestMakeName(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := MakeName(tt.args.year, tt.args.puzzle)
 			if tt.wantErr {
 				assert.Error(t, err)
 
 				return
 			}
+
 			assert.NoError(t, err)
+
 			assert.Equal(t, tt.want, got)
 		})
 	}

diff --git a/internal/puzzles/solutions/2015/day01/solution_test.go b/internal/puzzles/solutions/2015/day01/solution_test.go
@@ -124,8 +124,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {
@@ -180,8 +178,6 @@ func Test_solution_Part2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part2(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2015/day02/solution_test.go b/internal/puzzles/solutions/2015/day02/solution_test.go
@@ -68,8 +68,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {
@@ -124,8 +122,6 @@ func Test_solution_Part2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part2(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2016/day01/solution_test.go b/internal/puzzles/solutions/2016/day01/solution_test.go
@@ -76,8 +76,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {
@@ -124,8 +122,6 @@ func Test_solution_Part2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part2(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2016/day02/solution.go b/internal/puzzles/solutions/2016/day02/solution.go
@@ -119,7 +119,7 @@ let's predict that this is a 2 dimension matrix and '5' is 0,2m
 func loadKeypadPart2() keypad {
 	start := keypadPos{
 		x: 0,
-		y: 2,
+		y: 2, //nolint:mnd // False positive.
 	}
 
 	g := [][]string{

diff --git a/internal/puzzles/solutions/2017/day01/solution.go b/internal/puzzles/solutions/2017/day01/solution.go
@@ -54,7 +54,7 @@ func part2(in io.Reader) (string, error) {
 		return "", fmt.Errorf("make list: %w", err)
 	}
 
-	shift := len(list) / 2
+	shift := len(list) / 2 //nolint:mnd // False positive.
 
 	itr := newIterator(list, shift, true)
 

diff --git a/internal/puzzles/solutions/2017/day01/solution_test.go b/internal/puzzles/solutions/2017/day01/solution_test.go
@@ -85,8 +85,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {
@@ -174,8 +172,6 @@ func Test_solution_Part2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part2(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2018/day01/solution_test.go b/internal/puzzles/solutions/2018/day01/solution_test.go
@@ -84,8 +84,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {
@@ -164,8 +162,6 @@ func Test_solution_Part2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part2(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2019/day01/solution.go b/internal/puzzles/solutions/2019/day01/solution.go
@@ -81,6 +81,7 @@ func calc(input io.Reader, calcFn calcFunc) (string, error) {
 		in <- module{
 			mass: mass,
 		}
+
 		lines++
 	}
 

diff --git a/internal/puzzles/solutions/2019/day01/solution_test.go b/internal/puzzles/solutions/2019/day01/solution_test.go
@@ -68,8 +68,6 @@ func Test_module_fuel(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			m := module{
 				mass: tt.fields.mass,
@@ -116,8 +114,6 @@ func Test_calcPart1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			in <- module{mass: tt.input}
 
@@ -175,8 +171,6 @@ func Test_calcPart2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			in <- module{mass: tt.input}
 
@@ -232,8 +226,6 @@ func Test_calc(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			input := utils.ReaderFromFile(t, tt.args.inputPath)
 			got, err := calc(input, tt.args.calcFn)

diff --git a/internal/puzzles/solutions/2019/day02/solution_test.go b/internal/puzzles/solutions/2019/day02/solution_test.go
@@ -50,8 +50,6 @@ func Test_nounVerb(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got := nounVerb(tt.args.noun, tt.args.verb)
 			assert.Equal(t, tt.want, got)
@@ -91,8 +89,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2019/day03/solution.go b/internal/puzzles/solutions/2019/day03/solution.go
@@ -185,8 +185,6 @@ func findCross(wm1, wm2 map[pos]int) []pos {
 	res := make([]pos, 0, len(wm1))
 
 	for p := range wm1 {
-		p := p
-
 		if _, exist := wm2[p]; exist {
 			res = append(res, p)
 		}

diff --git a/internal/puzzles/solutions/2019/day03/solution_test.go b/internal/puzzles/solutions/2019/day03/solution_test.go
@@ -79,8 +79,6 @@ func Test_solution_Part1(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part1(tt.args.input)
 			if tt.wantErr {
@@ -131,8 +129,6 @@ func Test_findCross(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got := findCross(tt.args.wm1, tt.args.wm2)
 			assert.ElementsMatch(t, tt.want, got)
@@ -182,8 +178,6 @@ func Test_solution_Part2(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := s.Part2(tt.args.input)
 			if tt.wantErr {

diff --git a/internal/puzzles/solutions/2019/day04/solution.go b/internal/puzzles/solutions/2019/day04/solution.go
@@ -96,15 +96,13 @@ func isIncreasing(n int) bool {
 func hasRepeated(n int) bool {
 	nmbs := intToSlice(n)
 
-	var hasRepeated bool
-
 	for i := 1; i <= len(nmbs)-1; i++ {
 		if nmbs[i] == nmbs[i-1] {
-			hasRepeated = true
+			return true
 		}
 	}
 
-	return hasRepeated
+	return false
 }
 
 func hasRepeatedWithDouble(n int) bool {
@@ -143,6 +141,7 @@ func isPasswordPart2(n int) bool {
 	return isIncreasing(n) && hasRepeatedWithDouble(n)
 }
 
+//nolint:mnd // False positive.
 func intToSlice(n int) [6]int {
 	return [6]int{
 		(n % 1000000) / 100000,
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,7 @@ func calc(input io.Reader, calcFn calcFunc) (string, error) { @@
     		in <- module{
     			mass: mass,
     		}
     		lines++
     	}
@@ Expand Down @@