From 17258fad5b54e3ce0c43e548c20acd5e1dd5b69a Mon Sep 17 00:00:00 2001
From: Adam Chalkley <atc0005@users.noreply.github.com>
Date: Thu, 15 Apr 2021 06:11:11 -0500
Subject: [PATCH] Re-enable deprecated maligned linter

Disable govet:fieldalignment, re-enable deprecated maligned
linter until the Go team offers more control over the types
of checks provided by the fieldalignment linter or
golangci-lint does so.

refs GH-218
refs GH-219
refs GH-220
refs atc0005/go-ci#302
---
 .golangci.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index bba9e6d4..8634d6d1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -33,6 +33,11 @@ linters:
     - depguard
     - prealloc
     - misspell
+
+    # Deprecated linter, but still functional as of golangci-lint v1.39.0.
+    # See https://github.com/atc0005/go-ci/issues/302 for more information.
+    - maligned
+
     - dupl
     - unconvert
     - gofmt
@@ -40,10 +45,18 @@ linters:
     - gocritic
     - exportloopref
 
-  disable:
-    - maligned
+#
+# Disable fieldalignment settings until the Go team offers more control over
+# the types of checks provided by the fieldalignment linter or golangci-lint
+# does so.
+#
+# See https://github.com/atc0005/go-ci/issues/302 for more information.
+#
+
+# disable:
+# - maligned
 
-linters-settings:
-  govet:
-    enable:
-      - fieldalignment
+# linters-settings:
+# govet:
+#   enable:
+#     - fieldalignment