Update nolint comments.

I figured out that adding a second `//` lets you inline the commentary. Without
that it complains about unknown linters (because it tries to interpret the
comment as a list of linters).

Signed-off-by: Ian Campbell <ijc@docker.com>

Author: Ian Campbell

internal/commands/push.go

@@ -183,8 +183,7 @@ func (r *interactiveDisplay) onEvent(ev remotes.FixupEvent) {
 	for _, s := range r.images {
 		r.previousLineCount += s.print(out)
 	}
-	// nolint because there is nothing much we can do with an error to write to our output.
-	r.out.Write(out.Bytes()) //nolint:errcheck
+	r.out.Write(out.Bytes()) //nolint:errcheck // nothing much we can do with an error to write to output.
 }
 
 func (r *interactiveDisplay) imageIndex(name string) int {

internal/commands/root.go

@@ -49,10 +49,9 @@ func firstOrEmpty(list []string) string {
 func muteDockerCli(dockerCli command.Cli) func() {
 	stdout := dockerCli.Out()
 	stderr := dockerCli.Err()
-	// nolint because WithCombinedStreams cannot error
-	dockerCli.Apply(command.WithCombinedStreams(ioutil.Discard)) //nolint:errcheck
+	dockerCli.Apply(command.WithCombinedStreams(ioutil.Discard)) //nolint:errcheck // WithCombinedStreams cannot error
 	return func() {
-		dockerCli.Apply(command.WithOutputStream(stdout), command.WithErrorStream(stderr)) //nolint:errcheck
+		dockerCli.Apply(command.WithOutputStream(stdout), command.WithErrorStream(stderr)) //nolint:errcheck // as above
 	}
 }
 

pkg/yatee/yatee_test.go

@@ -28,10 +28,7 @@ func TestEval(t *testing.T) {
 	testEval(t, "${foo?foo:bar}", env, "foo")
 }
 
-// The nolint is because `parameters` is always the same, but it is
-// preferable to keep the definition in the caller since it
-// corresponds to `input` and `output`.
-func testProcess(t *testing.T, input, output, parameters, error string) { //nolint:unparam
+func testProcess(t *testing.T, input, output, parameters, error string) { //nolint:unparam // `parameters` defined near `input` and `output`.
 	ps := make(map[interface{}]interface{})
 	err := yaml.Unmarshal([]byte(parameters), ps)
 	assert.NilError(t, err)