From a0ca59b719ce73dfad02ca9396a1964fddf68e2a Mon Sep 17 00:00:00 2001
From: Faye Amacker <33205765+fxamacker@users.noreply.github.com>
Date: Sat, 11 Nov 2023 19:18:43 -0600
Subject: [PATCH] Enable more linters

---
 .golangci.yml   | 7 ++++---
 encode.go       | 6 +-----
 simplevalue.go  | 9 +++++----
 structfields.go | 2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 4c31d564..e65c0533 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -41,16 +41,17 @@ linters-settings:
 linters:
   disable-all: true
   enable:
+    - bidichk
     - errcheck
     - goconst
     - gocyclo
-    # - gofmt       # handled by safer-golangci-lint.yml
-    # - goimports   # handled by safer-golangci-lint.yml
+    - gofmt
+    - goimports
     - gosec
     - govet
     - ineffassign
     - misspell
-    # - revive      # temporarily disabled to reduce noise in golangci-lint 1.52.2
+    - revive
     - staticcheck
     - typecheck
     - unconvert
diff --git a/encode.go b/encode.go
index afb6c8c7..f329f5da 100644
--- a/encode.go
+++ b/encode.go
@@ -1266,11 +1266,7 @@ func encodeTag(e *encoderBuffer, em *encMode, v reflect.Value) error {
 	encodeHead(e, byte(cborTypeTag), t.Number)
 
 	// Marshal tag content
-	if err := encode(e, em, reflect.ValueOf(t.Content)); err != nil {
-		return err
-	}
-
-	return nil
+	return encode(e, em, reflect.ValueOf(t.Content))
 }
 
 func encodeSimpleValue(e *encoderBuffer, em *encMode, v reflect.Value) error {
diff --git a/simplevalue.go b/simplevalue.go
index ec77a946..14fd147e 100644
--- a/simplevalue.go
+++ b/simplevalue.go
@@ -4,10 +4,11 @@ import "reflect"
 
 // SimpleValue represents CBOR simple value.
 // CBOR simple value is:
-// * an extension point like CBOR tag.
-// * a subset of CBOR major type 7 that isn't floating-point.
-// * "identified by a number between 0 and 255, but distinct from that number itself".
-//   For example, "a simple value 2 is not equivalent to an integer 2" as a CBOR map key.
+//   - an extension point like CBOR tag.
+//   - a subset of CBOR major type 7 that isn't floating-point.
+//   - "identified by a number between 0 and 255, but distinct from that number itself".
+//     For example, "a simple value 2 is not equivalent to an integer 2" as a CBOR map key.
+//
 // CBOR simple values identified by 20..23 are: "false", "true" , "null", and "undefined".
 // Other CBOR simple values are currently unassigned/reserved by IANA.
 type SimpleValue uint8
diff --git a/structfields.go b/structfields.go
index 7c5974f3..e811aa1e 100644
--- a/structfields.go
+++ b/structfields.go
@@ -129,7 +129,7 @@ func getFields(t reflect.Type) (flds fields, structOptions string) {
 		}
 
 		// Skip fields with the same field name.
-		for i++; i < len(flds) && name == flds[i].name; i++ {
+		for i++; i < len(flds) && name == flds[i].name; i++ { //nolint:revive
 		}
 	}
 	if j != len(flds) {