Skip to content

Commit 83287db

Browse files
authored
Merge pull request #1078 from henry118/multierror
use errors package in golang v20 to join multiple errors
2 parents 951d8d0 + a67dabb commit 83287db

File tree

2 files changed

+2
-59
lines changed

2 files changed

+2
-59
lines changed

libcni/api.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ package libcni
2323
import (
2424
"context"
2525
"encoding/json"
26+
"errors"
2627
"fmt"
2728
"os"
2829
"path/filepath"
@@ -815,7 +816,7 @@ func (c *CNIConfig) GCNetworkList(ctx context.Context, list *NetworkConfigList,
815816
}
816817
}
817818

818-
return joinErrors(errs...)
819+
return errors.Join(errs...)
819820
}
820821

821822
func (c *CNIConfig) gcNetwork(ctx context.Context, net *NetworkConfig) error {

libcni/multierror.go

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)