From 754fe7884373465bd33352d29e5186559335c1fb Mon Sep 17 00:00:00 2001
From: junler <junler_top@qq.com>
Date: Fri, 7 Jun 2024 16:36:23 +0800
Subject: [PATCH 1/2] Compatibility standard library error: IIs interface not
 implemented

---
 errors/gerror/gerror_api_stack.go   | 10 +++++++---
 errors/gerror/gerror_z_unit_test.go |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/errors/gerror/gerror_api_stack.go b/errors/gerror/gerror_api_stack.go
index 79b4d6b02af..1737c265cff 100644
--- a/errors/gerror/gerror_api_stack.go
+++ b/errors/gerror/gerror_api_stack.go
@@ -93,10 +93,14 @@ func Equal(err, target error) bool {
 // Is reports whether current error `err` has error `target` in its chaining errors.
 // It is just for implements for stdlib errors.Is from Go version 1.17.
 func Is(err, target error) bool {
-	if e, ok := err.(IIs); ok {
-		return e.Is(target)
+	if err == nil {
+		return err == target
 	}
-	return false
+	e, ok := err.(IIs)
+	if !ok {
+		e = Wrap(err, "").(IIs)
+	}
+	return e.Is(target)
 }
 
 // HasError is alias of Is, which more easily understanding semantics.
diff --git a/errors/gerror/gerror_z_unit_test.go b/errors/gerror/gerror_z_unit_test.go
index cb892c401fc..226d347cad0 100644
--- a/errors/gerror/gerror_z_unit_test.go
+++ b/errors/gerror/gerror_z_unit_test.go
@@ -414,10 +414,15 @@ func Test_Is(t *testing.T) {
 		err2 := gerror.Wrap(err1, "2")
 		err2 = gerror.Wrap(err2, "3")
 		t.Assert(gerror.Is(err2, err1), true)
+
+		ErrNotFound := errors.New("not found")
+		t.Assert(gerror.Is(ErrNotFound, ErrNotFound), true)
+		t.Assert(gerror.Is(nil, ErrNotFound), false)
+		t.Assert(gerror.Is(nil, nil), true)
 	})
 }
 
-func Test_HashError(t *testing.T) {
+func Test_HasError(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		err1 := errors.New("1")
 		err2 := gerror.Wrap(err1, "2")
@@ -426,7 +431,7 @@ func Test_HashError(t *testing.T) {
 	})
 }
 
-func Test_HashCode(t *testing.T) {
+func Test_HasCode(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		t.Assert(gerror.HasCode(nil, gcode.CodeNotAuthorized), false)
 		err1 := errors.New("1")

From b48f8c598fb53771255a49764640a0ed4b5b9b6c Mon Sep 17 00:00:00 2001
From: junler <junler_top@qq.com>
Date: Fri, 7 Jun 2024 17:17:58 +0800
Subject: [PATCH 2/2] Support comparison between standard library errors

---
 errors/gerror/gerror_z_example_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/errors/gerror/gerror_z_example_test.go b/errors/gerror/gerror_z_example_test.go
index 998b5423700..6d828abbde5 100644
--- a/errors/gerror/gerror_z_example_test.go
+++ b/errors/gerror/gerror_z_example_test.go
@@ -77,7 +77,7 @@ func ExampleIs() {
 	fmt.Println(gerror.Is(err1, err2))
 
 	// Output:
-	// false
+	// true
 	// true
 	// true
 	// false