From 8d83778314eeffb2f6f684908321df8f74e0452e Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Tue, 15 Feb 2022 11:16:19 +0100 Subject: [PATCH] tools+golangci-lint: enable fixed version of whitespace linter --- .golangci.yml | 4 ---- tools/go.mod | 3 +++ tools/go.sum | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index d8d79cbfe..3949f123e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -83,10 +83,6 @@ linters: # Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19. - errorlint - # Has an issue (https://github.com/ultraware/whitespace/issues/6) but will - # want to enable this in the future. - - whitespace - # Deprecated linters. See https://golangci-lint.run/usage/linters/. - interfacer - golint diff --git a/tools/go.mod b/tools/go.mod index a8e8fa570..7389fb925 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -11,3 +11,6 @@ require ( github.com/rinchsan/gosimports v0.1.5 github.com/stephens2424/writerset v1.0.2 // indirect ) + +// Can be removed once this version is included in golangci-lint. +replace github.com/ultraware/whitespace => github.com/ultraware/whitespace v0.0.5 diff --git a/tools/go.sum b/tools/go.sum index 5e3975424..e26483566 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -859,8 +859,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= +github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= +github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/uudashr/gocognit v1.0.5 h1:rrSex7oHr3/pPLQ0xoWq108XMU8s678FJcQ+aSfOHa4=