summaryrefslogtreecommitdiff
path: root/vendor/github.com/sourcegraph/conc/internal/multierror
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/sourcegraph/conc/internal/multierror')
-rw-r--r--vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go10
-rw-r--r--vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go10
2 files changed, 20 insertions, 0 deletions
diff --git a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go
new file mode 100644
index 000000000..7087e32a8
--- /dev/null
+++ b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go
@@ -0,0 +1,10 @@
+//go:build !go1.20
+// +build !go1.20
+
+package multierror
+
+import "go.uber.org/multierr"
+
+var (
+ Join = multierr.Combine
+)
diff --git a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go
new file mode 100644
index 000000000..39cff829a
--- /dev/null
+++ b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go
@@ -0,0 +1,10 @@
+//go:build go1.20
+// +build go1.20
+
+package multierror
+
+import "errors"
+
+var (
+ Join = errors.Join
+)