Apply gofumpt on codebase

rymdport · Oct 29, 2023 · 80dea09 · 80dea09
1 parent 6abc780
commit 80dea09
Show file tree

Hide file tree

Showing 10 changed files with 2,752 additions and 2,757 deletions.
diff --git a/encoder.go b/encoder.go
@@ -277,19 +277,16 @@ func (d *dataEncoder) optimiseDataModes() error {
 			}
 
 			coalescedLength, err := d.encodedLength(mode, numChars+nextNumChars)
-
 			if err != nil {
 				return err
 			}
 
 			seperateLength1, err := d.encodedLength(mode, numChars)
-
 			if err != nil {
 				return err
 			}
 
 			seperateLength2, err := d.encodedLength(nextMode, nextNumChars)
-
 			if err != nil {
 				return err
 			}
@@ -302,8 +299,10 @@ func (d *dataEncoder) optimiseDataModes() error {
 			}
 		}
 
-		optimised := segment{dataMode: mode,
-			data: make([]byte, 0, numChars)}
+		optimised := segment{
+			dataMode: mode,
+			data:     make([]byte, 0, numChars),
+		}
 
 		for k := i; k < j; k++ {
 			optimised.data = append(optimised.data, d.actual[k].data...)

diff --git a/qrcode.go b/qrcode.go
@@ -74,7 +74,6 @@ func Encode(content string, level RecoveryLevel, size int) ([]byte, error) {
 	var q *QRCode
 
 	q, err := New(content, level)
-
 	if err != nil {
 		return nil, err
 	}
@@ -91,7 +90,6 @@ func WriteFile(content string, level RecoveryLevel, size int, filename string) e
 	var q *QRCode
 
 	q, err := New(content, level)
-
 	if err != nil {
 		return err
 	}
@@ -106,8 +104,8 @@ func WriteFile(content string, level RecoveryLevel, size int, filename string) e
 // a larger image is silently written. Negative values for size cause a variable
 // sized image to be written: See the documentation for Image().
 func WriteColorFile(content string, level RecoveryLevel, size int, background,
-	foreground color.Color, filename string) error {
-
+	foreground color.Color, filename string,
+) error {
 	var q *QRCode
 
 	q, err := New(content, level)
@@ -153,8 +151,10 @@ type QRCode struct {
 //
 // An error occurs if the content is too long.
 func New(content string, level RecoveryLevel) (*QRCode, error) {
-	encoders := []dataEncoderType{dataEncoderType1To9, dataEncoderType10To26,
-		dataEncoderType27To40}
+	encoders := []dataEncoderType{
+		dataEncoderType1To9, dataEncoderType10To26,
+		dataEncoderType27To40,
+	}
 
 	var encoder *dataEncoder
 	var encoded *bitset.Bitset
@@ -221,7 +221,6 @@ func NewWithForcedVersion(content string, version int, level RecoveryLevel) (*QR
 
 	var encoded *bitset.Bitset
 	encoded, err := encoder.encode([]byte(content))
-
 	if err != nil {
 		return nil, err
 	}
@@ -340,7 +339,6 @@ func (q *QRCode) PNG(size int) ([]byte, error) {
 
 	var b bytes.Buffer
 	err := encoder.Encode(&b, img)
-
 	if err != nil {
 		return nil, err
 	}
@@ -357,7 +355,6 @@ func (q *QRCode) Write(size int, out io.Writer) error {
 	var png []byte
 
 	png, err := q.PNG(size)
-
 	if err != nil {
 		return err
 	}
@@ -374,12 +371,11 @@ func (q *QRCode) WriteFile(size int, filename string) error {
 	var png []byte
 
 	png, err := q.PNG(size)
-
 	if err != nil {
 		return err
 	}
 
-	return os.WriteFile(filename, png, os.FileMode(0644))
+	return os.WriteFile(filename, png, os.FileMode(0o644))
 }
 
 // encode completes the steps required to encode the QR Code. These include
@@ -414,7 +410,7 @@ func (q *QRCode) encode() {
 
 		p := s.penaltyScore()
 
-		//log.Printf("mask=%d p=%3d p1=%3d p2=%3d p3=%3d p4=%d\n", mask, p, s.penalty1(), s.penalty2(), s.penalty3(), s.penalty4())
+		// log.Printf("mask=%d p=%3d p1=%3d p2=%3d p3=%3d p4=%d\n", mask, p, s.penalty1(), s.penalty2(), s.penalty3(), s.penalty4())
 
 		if q.symbol == nil || p < penalty {
 			q.symbol = s

diff --git a/qrcode_test.go b/qrcode_test.go
@@ -38,7 +38,6 @@ func TestQRCodeMaxCapacity(t *testing.T) {
 
 	for _, test := range tests {
 		_, err := New(strings.Repeat(test.string, test.numRepetitions), Low)
-
 		if err != nil {
 			t.Errorf("%d x '%s' got %s expected success", test.numRepetitions,
 				test.string, err.Error())
@@ -145,7 +144,6 @@ func TestQRCodeVersionCapacity(t *testing.T) {
 func TestQRCodeISOAnnexIExample(t *testing.T) {
 	var q *QRCode
 	q, err := New("01234567", Medium)
-
 	if err != nil {
 		t.Fatalf("Error producing ISO Annex I Example: %s, expected success",
 			err.Error())

diff --git a/reedsolomon/gf2_8.go b/reedsolomon/gf2_8.go
@@ -42,7 +42,8 @@ var (
 		/* 220 - 229 */ 172, 69, 138, 9, 18, 36, 72, 144, 61, 122,
 		/* 230 - 239 */ 244, 245, 247, 243, 251, 235, 203, 139, 11, 22,
 		/* 240 - 249 */ 44, 88, 176, 125, 250, 233, 207, 131, 27, 54,
-		/* 250 - 255 */ 108, 216, 173, 71, 142, 1}
+		/* 250 - 255 */ 108, 216, 173, 71, 142, 1,
+	}
 
 	gfLogTable = [256]int{
 		/*   0 -   9 */ -1, 0, 1, 25, 2, 50, 26, 198, 3, 223,
@@ -70,7 +71,8 @@ var (
 		/* 220 - 229 */ 187, 204, 62, 90, 203, 89, 95, 176, 156, 169,
 		/* 230 - 239 */ 160, 81, 11, 245, 22, 235, 122, 117, 44, 215,
 		/* 240 - 249 */ 79, 174, 213, 233, 230, 231, 173, 232, 116, 214,
-		/* 250 - 255 */ 244, 234, 168, 80, 88, 175}
+		/* 250 - 255 */ 244, 234, 168, 80, 88, 175,
+	}
 )
 
 // gfElement is an element in GF(2^8).

diff --git a/reedsolomon/gf2_8_test.go b/reedsolomon/gf2_8_test.go
@@ -20,7 +20,7 @@ func TestGFMultiplicationIdentities(t *testing.T) {
 
 func TestGFMultiplicationAndDivision(t *testing.T) {
 	// a * b == result
-	var tests = []struct {
+	tests := []struct {
 		a      gfElement
 		b      gfElement
 		result gfElement

diff --git a/reedsolomon/gf_poly_test.go b/reedsolomon/gf_poly_test.go
@@ -7,7 +7,7 @@ import "testing"
 
 func TestGFPolyAdd(t *testing.T) {
 	// a + b == result
-	var tests = []struct {
+	tests := []struct {
 		a      gfPoly
 		b      gfPoly
 		result gfPoly
@@ -45,7 +45,7 @@ func TestGFPolyAdd(t *testing.T) {
 
 func TestGFPolyequals(t *testing.T) {
 	// a == b if isEqual
-	var tests = []struct {
+	tests := []struct {
 		a       gfPoly
 		b       gfPoly
 		isEqual bool
@@ -84,7 +84,7 @@ func TestGFPolyequals(t *testing.T) {
 
 func TestGFPolyMultiply(t *testing.T) {
 	// a * b == result
-	var tests = []struct {
+	tests := []struct {
 		a      gfPoly
 		b      gfPoly
 		result gfPoly
@@ -121,7 +121,7 @@ func TestGFPolyMultiply(t *testing.T) {
 
 func TestGFPolyRemainder(t *testing.T) {
 	// numerator / denominator == quotient + remainder.
-	var tests = []struct {
+	tests := []struct {
 		numerator   gfPoly
 		denominator gfPoly
 		remainder   gfPoly

diff --git a/reedsolomon/reed_solomon_test.go b/reedsolomon/reed_solomon_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestGeneratorPoly(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		degree    int
 		generator gfPoly
 	}{
@@ -36,11 +36,13 @@ func TestGeneratorPoly(t *testing.T) {
 		// + 11x^0 (the longest generator poly)
 		{
 			68,
-			gfPoly{term: []gfElement{11, 99, 29, 32, 8, 204, 149, 34, 12,
+			gfPoly{term: []gfElement{
+				11, 99, 29, 32, 8, 204, 149, 34, 12,
 				235, 11, 119, 7, 255, 239, 211, 157, 80, 4, 199, 36, 63, 88, 158, 51, 212,
 				219, 20, 245, 226, 175, 14, 20, 144, 225, 230, 246, 71, 107, 38, 107, 182,
 				170, 224, 172, 145, 112, 185, 20, 109, 167, 174, 34, 107, 85, 119, 142,
-				157, 230, 223, 94, 60, 182, 18, 39, 9, 115, 131, 1}},
+				157, 230, 223, 94, 60, 182, 18, 39, 9, 115, 131, 1,
+			}},
 		},
 	}
 
@@ -55,7 +57,7 @@ func TestGeneratorPoly(t *testing.T) {
 }
 
 func TestEncode(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		numECBytes int
 		data       string
 		rsCode     string

diff --git a/regular_symbol.go b/regular_symbol.go
@@ -103,8 +103,8 @@ var (
 )
 
 func buildRegularSymbol(version qrCodeVersion, mask int,
-	data *bitset.Bitset, includeQuietZone bool) (*symbol, error) {
-
+	data *bitset.Bitset, includeQuietZone bool,
+) (*symbol, error) {
 	quietZoneSize := 0
 	if includeQuietZone {
 		quietZoneSize = version.quietZoneSize()

diff --git a/regular_symbol_test.go b/regular_symbol_test.go
@@ -25,7 +25,7 @@ func TestBuildRegularSymbol(t *testing.T) {
 			fmt.Println(err.Error())
 		} else {
 			_ = s
-			//fmt.Print(m.string())
+			// fmt.Print(m.string())
 		}
 	}
 }