重构

Author: FishGoddess

HISTORY.md

@@ -1,6 +1,6 @@
 ## ✒ 历史版本的特性介绍 (Features in old versions)
 
-### v0.8.0
+### v0.6.0-alpha
 
 > 此版本发布于 2024-08-09
 

Makefile

@@ -6,4 +6,4 @@ fmt:
 	go fmt ./...
 
 test:
-	go test -v -cover -count=1 -test.cpu=1 ./...
+	go test -cover -count=1 -test.cpu=1 ./...

README.en.md

@@ -39,9 +39,10 @@ func main() {
 	fmt.Println(errors.Code(io.EOF, 6699), errors.Message(io.EOF, "default message"))
 
 	// Also, we provide some useful information carrier for you.
-	err = errors.Wrap(9999, "io timeout").With(io.EOF).WithCaller().WithArgs("key", "value")
+	err = errors.Wrap(9999, "io timeout").With(io.EOF).WithCaller()
 	fmt.Println(err)
 }
+
 ```
 
 * [basic](_examples/basic.go)

README.md

@@ -39,9 +39,10 @@ func main() {
 	fmt.Println(errors.Code(io.EOF, 6699), errors.Message(io.EOF, "default message"))
 
 	// Also, we provide some useful information carrier for you.
-	err = errors.Wrap(9999, "io timeout").With(io.EOF).WithCaller().WithArgs("key", "value")
+	err = errors.Wrap(9999, "io timeout").With(io.EOF).WithCaller()
 	fmt.Println(err)
 }
+
 ```
 
 * [basic](_examples/basic.go)

_examples/basic.go

@@ -25,6 +25,6 @@ func main() {
 	fmt.Println(errors.Code(io.EOF, 6699), errors.Message(io.EOF, "default message"))
 
 	// Also, we provide some useful information carrier for you.
-	err = errors.Wrap(9999, "io timeout").With(io.EOF).WithCaller().WithArgs("key", "value")
+	err = errors.Wrap(9999, "io timeout").With(io.EOF).WithCaller()
 	fmt.Println(err)
 }

_icons/coverage.svg

@@ -5,6 +5,7 @@
 package errors
 
 import (
+	"errors"
 	"io"
 	"os"
 	"testing"
@@ -124,3 +125,40 @@ func TestUnwrap(t *testing.T) {
 		}
 	}
 }
+
+// go test -v -cover -count=1 -test.cpu=1 -run=^TestJoin$
+func TestJoin(t *testing.T) {
+	testCases := []struct {
+		errs []error
+	}{
+		{
+			errs: nil,
+		},
+		{
+			errs: []error{nil, nil},
+		},
+		{
+			errs: []error{io.EOF, &testError{}},
+		},
+		{
+			errs: []error{io.EOF, nil},
+		},
+	}
+
+	for _, testCase := range testCases {
+		got := Join(testCase.errs...)
+		want := errors.Join(testCase.errs...)
+
+		if got != nil && want != nil {
+			if got.Error() != want.Error() {
+				t.Errorf("got %+v != want %+v", got, want)
+			}
+
+			continue
+		}
+
+		if got != want {
+			t.Errorf("got %+v != want %+v", got, want)
+		}
+	}
+}

errors_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func Caller() string {
-	_, file, line, ok := runtime.Caller(1)
+	_, file, line, ok := runtime.Caller(2)
 	if !ok {
 		return ""
 	}
@@ -20,7 +20,7 @@ func Caller() string {
 
 func Callers() []string {
 	var pcs [16]uintptr
-	n := runtime.Callers(2, pcs[:])
+	n := runtime.Callers(3, pcs[:])
 	frames := runtime.CallersFrames(pcs[:n])
 
 	var callers []string

runtime.go

@@ -5,6 +5,7 @@
 package errors
 
 import (
+	"bytes"
 	"fmt"
 	"strings"
 )
@@ -14,7 +15,6 @@ type Error struct {
 	message string
 	cause   error
 	caller  string
-	args    []any
 }
 
 // Wrap returns *Error with code and message formatted with args.
@@ -47,11 +47,6 @@ func (e *Error) WithCallers() *Error {
 	return e
 }
 
-func (e *Error) WithArgs(args ...any) *Error {
-	e.args = append(e.args, args...)
-	return e
-}
-
 // Code returns the code of *Error.
 func (e *Error) Code() int32 {
 	return e.code
@@ -74,9 +69,16 @@ func (e *Error) Error() string {
 
 // String returns *Error as string.
 func (e *Error) String() string {
-	if e.cause == nil {
-		return fmt.Sprintf("%d: %s", e.code, e.message)
+	var buff bytes.Buffer
+	fmt.Fprintf(&buff, "%d: %s", e.code, e.message)
+
+	if e.caller != "" {
+		fmt.Fprintf(&buff, " [%s]", e.caller)
+	}
+
+	if e.cause != nil {
+		fmt.Fprintf(&buff, " (%+v)", e.cause)
 	}
 
-	return fmt.Sprintf("%d: %s (%+v)", e.code, e.message, e.cause)
+	return buff.String()
 }