commands/history: rewrite with stdlib multi-errors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

commands/history/rm.go

@@ -2,11 +2,11 @@ package history
 
 import (
 	"context"
+	stderrors "errors"
 	"io"
 
 	"github.com/docker/buildx/util/cobrautil/completion"
 	"github.com/docker/cli/cli/command"
-	"github.com/hashicorp/go-multierror"
 	controlapi "github.com/moby/buildkit/api/services/control"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -90,26 +90,18 @@ func runRm(ctx context.Context, dockerCli command.Cli, opts rmOptions) error {
 	var out []error
 loop0:
 	for _, nodeErrs := range errs {
-		var nodeErr error
+		var nodeErr []error
 		for _, err1 := range nodeErrs {
 			if err1 == nil {
 				continue loop0
 			}
-			if nodeErr == nil {
-				nodeErr = err1
-			} else {
-				nodeErr = multierror.Append(nodeErr, err1)
-			}
+			nodeErr = append(nodeErr, err1)
+		}
+		if len(nodeErr) > 0 {
+			out = append(out, stderrors.Join(nodeErr...))
 		}
-		out = append(out, nodeErr)
 	}
-	if len(out) == 0 {
-		return nil
-	}
-	if len(out) == 1 {
-		return out[0]
-	}
-	return multierror.Append(out[0], out[1:]...)
+	return stderrors.Join(out...)
 }
 
 func rmCmd(dockerCli command.Cli, rootOpts RootOptions) *cobra.Command {