From 24e62e18fa5702a12a33d2bc1214f9197ca0b1e1 Mon Sep 17 00:00:00 2001
From: Cuong Manh Le <cuong@windscribe.com>
Date: Wed, 5 Apr 2023 16:58:58 +0700
Subject: [PATCH] Use errors.Join instead of copied version

---
 errors.go   | 43 -------------------------------------------
 resolver.go |  2 +-
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 errors.go

diff --git a/errors.go b/errors.go
deleted file mode 100644
index 8b47c6c..0000000
--- a/errors.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package ctrld
-
-// TODO(cuonglm): use stdlib once we bump minimum version to 1.20
-
-func joinErrors(errs ...error) error {
-	n := 0
-	for _, err := range errs {
-		if err != nil {
-			n++
-		}
-	}
-	if n == 0 {
-		return nil
-	}
-	e := &joinError{
-		errs: make([]error, 0, n),
-	}
-	for _, err := range errs {
-		if err != nil {
-			e.errs = append(e.errs, err)
-		}
-	}
-	return e
-}
-
-type joinError struct {
-	errs []error
-}
-
-func (e *joinError) Error() string {
-	var b []byte
-	for i, err := range e.errs {
-		if i > 0 {
-			b = append(b, '\n')
-		}
-		b = append(b, err.Error()...)
-	}
-	return string(b)
-}
-
-func (e *joinError) Unwrap() []error {
-	return e.errs
-}
diff --git a/resolver.go b/resolver.go
index 45537fa..77517e6 100644
--- a/resolver.go
+++ b/resolver.go
@@ -93,7 +93,7 @@ func (o *osResolver) Resolve(ctx context.Context, msg *dns.Msg) (*dns.Msg, error
 		errs = append(errs, res.err)
 	}
 
-	return nil, joinErrors(errs...)
+	return nil, errors.Join(errs...)
 }
 
 func newDialer(dnsAddress string) *net.Dialer {