diff --git a/download.go b/download.go index 289378a8..da31b29a 100644 --- a/download.go +++ b/download.go @@ -11,7 +11,7 @@ import ( "sync" alpm "github.com/Jguer/go-alpm" - "github.com/Jguer/yay/v9/pkg/types" + "github.com/Jguer/yay/v9/pkg/multierror" ) const gitDiffRefName = "AUR_SEEN" @@ -265,7 +265,7 @@ func getPkgbuilds(pkgs []string) error { func getPkgbuildsfromABS(pkgs []string, path string) (bool, error) { var wg sync.WaitGroup var mux sync.Mutex - var errs types.MultiError + var errs multierror.MultiError names := make(map[string]string) missing := make([]string, 0) downloaded := 0 diff --git a/install.go b/install.go index 9ef80dea..fcc41822 100644 --- a/install.go +++ b/install.go @@ -12,8 +12,8 @@ import ( alpm "github.com/Jguer/go-alpm" "github.com/Jguer/yay/v9/pkg/completion" "github.com/Jguer/yay/v9/pkg/intrange" + "github.com/Jguer/yay/v9/pkg/multierror" "github.com/Jguer/yay/v9/pkg/stringset" - "github.com/Jguer/yay/v9/pkg/types" gosrc "github.com/Morganamilo/go-srcinfo" ) @@ -718,7 +718,7 @@ func editDiffNumberMenu(bases []Base, installed stringset.StringSet, diff bool) } func updatePkgbuildSeenRef(bases []Base, cloned stringset.StringSet) error { - var errMulti types.MultiError + var errMulti multierror.MultiError for _, base := range bases { pkg := base.Pkgbase() dir := filepath.Join(config.BuildDir, pkg) @@ -733,7 +733,7 @@ func updatePkgbuildSeenRef(bases []Base, cloned stringset.StringSet) error { } func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error { - var errMulti types.MultiError + var errMulti multierror.MultiError for _, base := range bases { pkg := base.Pkgbase() dir := filepath.Join(config.BuildDir, pkg) @@ -886,7 +886,7 @@ func downloadPkgbuilds(bases []Base, toSkip stringset.StringSet, buildDir string downloaded := 0 var wg sync.WaitGroup var mux sync.Mutex - var errs types.MultiError + var errs multierror.MultiError download := func(k int, base Base) { defer wg.Done() diff --git a/pkg/types/multierror.go b/pkg/multierror/multierror.go similarity index 97% rename from pkg/types/multierror.go rename to pkg/multierror/multierror.go index 5d50b4e3..4d2bb4d3 100644 --- a/pkg/types/multierror.go +++ b/pkg/multierror/multierror.go @@ -1,4 +1,4 @@ -package types +package multierror import "sync" diff --git a/query.go b/query.go index 21aae40f..68b1154d 100644 --- a/query.go +++ b/query.go @@ -10,7 +10,7 @@ import ( alpm "github.com/Jguer/go-alpm" "github.com/Jguer/yay/v9/pkg/intrange" - "github.com/Jguer/yay/v9/pkg/types" + "github.com/Jguer/yay/v9/pkg/multierror" "github.com/Jguer/yay/v9/pkg/stringset" rpc "github.com/mikkeloscar/aur" @@ -503,7 +503,7 @@ func aurInfo(names []string, warnings *aurWarnings) ([]*rpc.Pkg, error) { seen := make(map[string]int) var mux sync.Mutex var wg sync.WaitGroup - var errs types.MultiError + var errs multierror.MultiError makeRequest := func(n, max int) { defer wg.Done() diff --git a/upgrade.go b/upgrade.go index 278c912c..ae4f6afa 100644 --- a/upgrade.go +++ b/upgrade.go @@ -9,8 +9,8 @@ import ( alpm "github.com/Jguer/go-alpm" "github.com/Jguer/yay/v9/pkg/intrange" + "github.com/Jguer/yay/v9/pkg/multierror" "github.com/Jguer/yay/v9/pkg/stringset" - "github.com/Jguer/yay/v9/pkg/types" rpc "github.com/mikkeloscar/aur" ) @@ -124,7 +124,7 @@ func upList(warnings *aurWarnings) (upSlice, upSlice, error) { var repoUp upSlice var aurUp upSlice - var errs types.MultiError + var errs multierror.MultiError aurdata := make(map[string]*rpc.Pkg)