fix: Address linter rules after golangci-lint upgrade

Author: kinbiko

.golangci.yml

@@ -64,11 +64,6 @@ linters-settings:
     min-len: 10
     # minimal occurrences count to trigger, 3 by default
     min-occurrences: 3
-  depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - github.com/satori/go.uuid
 
     # packages-with-error-messages:
       # specify an error message to output when a blacklisted package is used
@@ -154,6 +149,8 @@ linters:
     - godot
     - nlreturn
 
+    - depguard
+
       # These are apparently deprecated but still yell at you if you don't disable them
     - golint
     - scopelint

core.go

@@ -38,7 +38,7 @@ func (a *Asserter) pathassertf(path, act, exp string) {
 		a.tt.Errorf("actual JSON (%s) and expected JSON (%s) were of different types at '%s'", actType, expType, path)
 		return
 	}
-	switch actType { // nolint:exhaustive // already know it's valid JSON and not null
+	switch actType { //nolint:exhaustive // already know it's valid JSON and not null
 	case jsonBoolean:
 		actBool, _ := extractBoolean(act)
 		expBool, _ := extractBoolean(exp)
@@ -63,7 +63,7 @@ func (a *Asserter) pathassertf(path, act, exp string) {
 }
 
 func serialize(a interface{}) string {
-	// nolint:errchkjson // Can be confident this won't return an error: the
+	//nolint:errchkjson // Can be confident this won't return an error: the
 	// input will be a nested part of valid JSON, thus valid JSON
 	bytes, _ := json.Marshal(a)
 	return string(bytes)

examples_test.go

@@ -13,7 +13,8 @@ func (p *printer) Errorf(format string, args ...interface{}) {
 }
 
 // using the varible name 't' to mimic a *testing.T variable
-// nolint:gochecknoglobals // this is global to make the examples look like valid test code
+//
+//nolint:gochecknoglobals // this is global to make the examples look like valid test code
 var t *printer
 
 func ExampleNew() {

exports.go

@@ -64,7 +64,6 @@ you only need one *jsonassert.Asseter per (sub)test.
 In most cases, this will look something like
 
 	ja := jsonassert.New(t)
-
 */
 func New(p Printer) *Asserter {
 	// Initially this package was written without the assumption that the

helper.go

@@ -18,8 +18,8 @@ func (*noopHelperTT) Helper() {
 // e.g. to verify where one potential candidate is matching or not.
 type deepEqualityPrinter struct{ count int }
 
-func (p *deepEqualityPrinter) Errorf(msg string, args ...interface{}) { p.count++ }
-func (p *deepEqualityPrinter) Helper()                                { /* Intentional NOOP */ }
+func (p *deepEqualityPrinter) Errorf(_ string, _ ...interface{}) { p.count++ }
+func (p *deepEqualityPrinter) Helper()                           { /* Intentional NOOP */ }
 
 func (a *Asserter) deepEqual(act, exp interface{}) bool {
 	p := &deepEqualityPrinter{count: 0}

integration_test.go

@@ -460,7 +460,7 @@ type testCase struct {
 
 func (tc *testCase) check(t *testing.T) {
 	t.Helper()
-	tp := &testPrinter{}
+	tp := &testPrinter{messages: nil}
 	jsonassert.New(tp).Assertf(tc.act, tc.exp)
 
 	if got := len(tp.messages); got != len(tc.msgs) {

number.go

@@ -6,8 +6,10 @@ import (
 )
 
 // This is *probably* good enough. Can change this to be even smaller if necessary
-const minDiff = 0.000001
-const bitSize = 64
+const (
+	minDiff = 0.000001
+	bitSize = 64
+)
 
 func (a *Asserter) checkNumber(path string, act, exp float64) {
 	a.tt.Helper()