Use slices.Contains more

Replace 'for i, elem := range s { if elem == needle { ...; break }'
by a call to slices.Contains, added in go1.21.

Brought to you by

	modernize -fix -test -category slicescontains ./...

Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

cmd/podman/root.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"runtime/pprof"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -452,11 +453,8 @@ func loggingHook() {
 		}
 		logLevel = "debug"
 	}
-	for _, l := range common.LogLevels {
-		if l == strings.ToLower(logLevel) {
-			found = true
-			break
-		}
+	if slices.Contains(common.LogLevels, strings.ToLower(logLevel)) {
+		found = true
 	}
 	if !found {
 		fmt.Fprintf(os.Stderr, "Log Level %q is not supported, choose from: %s\n", logLevel, strings.Join(common.LogLevels, ", "))

cmd/podman/validate/choice.go

@@ -2,6 +2,7 @@ package validate
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 )
 
@@ -29,11 +30,9 @@ func (c *ChoiceValue) String() string {
 }
 
 func (c *ChoiceValue) Set(value string) error {
-	for _, v := range c.choices {
-		if v == value {
-			*c.value = value
-			return nil
-		}
+	if slices.Contains(c.choices, value) {
+		*c.value = value
+		return nil
 	}
 	return fmt.Errorf("%q is not a valid value.  Choose from: %q", value, c.Choices())
 }

libpod/container_commit.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/containers/buildah"
@@ -130,13 +131,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai
 		// Only include anonymous named volumes added by the user by
 		// default.
 		for _, v := range c.config.NamedVolumes {
-			include := false
-			for _, userVol := range c.config.UserVolumes {
-				if userVol == v.Dest {
-					include = true
-					break
-				}
-			}
+			include := slices.Contains(c.config.UserVolumes, v.Dest)
 			if include {
 				vol, err := c.runtime.GetVolume(v.Name)
 				if err != nil {

libpod/container_internal.go

@@ -351,12 +351,7 @@ func (c *Container) handleRestartPolicy(ctx context.Context) (_ bool, retErr err
 // Returns true if the container is in one of the given states,
 // or false otherwise.
 func (c *Container) ensureState(states ...define.ContainerStatus) bool {
-	for _, state := range states {
-		if state == c.state.State {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(states, c.state.State)
 }
 
 // Sync this container with on-disk state and runtime status
@@ -484,12 +479,7 @@ func (c *Container) setupStorage(ctx context.Context) error {
 	}
 	if c.config.Privileged {
 		privOpt := func(opt string) bool {
-			for _, privopt := range []string{"nodev", "nosuid", "noexec"} {
-				if opt == privopt {
-					return true
-				}
-			}
-			return false
+			return slices.Contains([]string{"nodev", "nosuid", "noexec"}, opt)
 		}
 
 		defOptions, err := storage.GetMountOptions(c.runtime.store.GraphDriverName(), c.runtime.store.GraphOptions())

libpod/container_internal_common.go

@@ -2730,11 +2730,8 @@ func (c *Container) userPasswdEntry(u *user.User) (string, error) {
 		hDir = filepath.Dir(hDir)
 	}
 	if homeDir != u.HomeDir {
-		for _, hDir := range c.UserVolumes() {
-			if hDir == u.HomeDir {
-				homeDir = u.HomeDir
-				break
-			}
+		if slices.Contains(c.UserVolumes(), u.HomeDir) {
+			homeDir = u.HomeDir
 		}
 	}
 

libpod/options.go

@@ -9,6 +9,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"syscall"
 	"time"
@@ -274,10 +275,8 @@ func WithHooksDir(hooksDirs ...string) RuntimeOption {
 			return define.ErrRuntimeFinalized
 		}
 
-		for _, hooksDir := range hooksDirs {
-			if hooksDir == "" {
-				return fmt.Errorf("empty-string hook directories are not supported: %w", define.ErrInvalidArg)
-			}
+		if slices.Contains(hooksDirs, "") {
+			return fmt.Errorf("empty-string hook directories are not supported: %w", define.ErrInvalidArg)
 		}
 
 		rt.config.Engine.HooksDir.Set(hooksDirs)

libpod/plugin/volume_api.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -106,13 +107,7 @@ func validatePlugin(newPlugin *VolumePlugin) error {
 		return fmt.Errorf("unmarshalling plugin %s activation response: %w", newPlugin.Name, err)
 	}
 
-	foundVolume := false
-	for _, pluginType := range respStruct.Implements {
-		if pluginType == volumePluginType {
-			foundVolume = true
-			break
-		}
-	}
+	foundVolume := slices.Contains(respStruct.Implements, volumePluginType)
 
 	if !foundVolume {
 		return fmt.Errorf("plugin %s does not implement volume plugin, instead provides %s: %w", newPlugin.Name, strings.Join(respStruct.Implements, ", "), ErrNotVolumePlugin)

libpod/runtime_pod.go

@@ -166,12 +166,7 @@ func (r *Runtime) PrunePods(ctx context.Context) (map[string]error, error) {
 	states := []string{define.PodStateStopped, define.PodStateExited}
 	filterFunc := func(p *Pod) bool {
 		state, _ := p.GetPodStatus()
-		for _, status := range states {
-			if state == status {
-				return true
-			}
-		}
-		return false
+		return slices.Contains(states, state)
 	}
 	pods, err := r.Pods(filterFunc)
 	if err != nil {

pkg/domain/filters/containers.go

@@ -55,10 +55,8 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
 		return func(c *libpod.Container) bool {
 			ec, exited, err := c.ExitCode()
 			if err == nil && exited {
-				for _, exitCode := range exitCodes {
-					if ec == exitCode {
-						return true
-					}
+				if slices.Contains(exitCodes, ec) {
+					return true
 				}
 			}
 			return false
@@ -179,12 +177,7 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
 			if err != nil {
 				return false
 			}
-			for _, filterValue := range filterValues {
-				if hcStatus == filterValue {
-					return true
-				}
-			}
-			return false
+			return slices.Contains(filterValues, hcStatus)
 		}, nil
 	case "until":
 		return prepareUntilFilterFunc(filterValues)
@@ -470,10 +463,8 @@ func GenerateExternalContainerFilterFuncs(filter string, filterValues []string,
 			ec := listContainer.ExitCode
 			exited := listContainer.Exited
 			if exited {
-				for _, exitCode := range exitCodes {
-					if ec == exitCode {
-						return true
-					}
+				if slices.Contains(exitCodes, ec) {
+					return true
 				}
 			}
 			return false

pkg/domain/filters/pods.go

@@ -111,12 +111,7 @@ func GeneratePodFilterFunc(filter string, filterValues []string, r *libpod.Runti
 			if err != nil {
 				return false
 			}
-			for _, filterValue := range filterValues {
-				if strings.ToLower(status) == filterValue {
-					return true
-				}
-			}
-			return false
+			return slices.Contains(filterValues, strings.ToLower(status))
 		}, nil
 	case "label":
 		return func(p *libpod.Pod) bool {