Merge pull request #4369 from baude/golandautocodecorrections

goland autocorrections

cmd/podman/import.go

@@ -6,7 +6,7 @@ import (
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/shared/parse"
 	"github.com/containers/libpod/pkg/adapter"
-	multierror "github.com/hashicorp/go-multierror"
+	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

pkg/adapter/containers_remote.go

@@ -1021,7 +1021,7 @@ func (r *LocalRuntime) Commit(ctx context.Context, c *cliconfig.CommitValues, co
 func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecValues) (int, error) {
 	var (
 		oldTermState *term.State
-		ec           int = define.ExecErrorCodeGeneric
+		ec           = define.ExecErrorCodeGeneric
 	)
 	// default invalid command exit code
 	// Validate given environment variables

pkg/network/subnet.go

@@ -18,7 +18,7 @@ func incByte(subnet *net.IPNet, idx int, shift uint) error {
 		subnet.IP[idx] = 0
 		return incByte(subnet, idx-1, 0)
 	}
-	subnet.IP[idx] += (1 << shift)
+	subnet.IP[idx] += 1 << shift
 	return nil
 }
 
@@ -58,7 +58,7 @@ func LastIPInSubnet(addr *net.IPNet) (net.IP, error) { //nolint:interfacer
 	}
 	hostStart := ones / 8
 	// Handle the first host byte
-	cidr.IP[hostStart] |= (0xff & cidr.Mask[hostStart])
+	cidr.IP[hostStart] |= 0xff & cidr.Mask[hostStart]
 	// Fill the rest with ones
 	for i := hostStart; i < len(cidr.IP); i++ {
 		cidr.IP[i] = 0xff

test/e2e/create_test.go

@@ -239,7 +239,7 @@ var _ = Describe("Podman create", func() {
 
 		session = podmanTest.PodmanNoCache([]string{"create", "--pull", "always", "--name=foo", "nginx"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To((Equal(0)))
+		Expect(session.ExitCode()).To(Equal(0))
 	})
 
 	It("podman create using image list by tag", func() {