xerrors: Revert "xerrors: redirect to go1.13 primitives for 1.13"

This reverts CL 167577 Reason for revert: errors.Frame and errors.Formatter were removed in CL 176997 Fixes golang/go#32246 Change-Id: I521cc1176311721a18aaf76d4966e945c8453e9d Reviewed-on: https://go-review.googlesource.com/c/xerrors/+/177379 Run-TryBot: Agniva De Sarker <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Matt Joiner <[email protected]> Reviewed-by: Damien Neil <[email protected]>
golang · Jul 17, 2019 · a985d34 · a985d34
1 parent 3ee3066
commit a985d34
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 99 deletions.
diff --git a/adaptor_go1_12.go → adaptor.go b/adaptor_go1_12.go → adaptor.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !go1.13
-
 package xerrors
 
 import (

diff --git a/adaptor_go1_13.go b/adaptor_go1_13.go
diff --git a/fmt_test.go b/fmt_test.go
@@ -7,6 +7,7 @@ package xerrors_test
 import (
 	"fmt"
 	"io"
+	"os"
 	"path"
 	"reflect"
 	"regexp"
@@ -90,7 +91,7 @@ func TestErrorFormatter(t *testing.T) {
 		nonascii = &wrapped{"café", nil}
 		newline  = &wrapped{"msg with\nnewline",
 			&wrapped{"and another\none", nil}}
-		fallback  = &wrapped{"fallback", xerrors.New("file does not exist")}
+		fallback  = &wrapped{"fallback", os.ErrNotExist}
 		oldAndNew = &wrapped{"new style", formatError("old style")}
 		framed    = &withFrameAndMore{
 			frame: xerrors.Caller(0),
@@ -105,13 +106,6 @@ func TestErrorFormatter(t *testing.T) {
 		want   string
 		regexp bool
 	}{{
-		err: xerrors.New("foo"),
-		fmt: "%+v",
-		want: "foo:" +
-			"\n    golang.org/x/xerrors_test.TestErrorFormatter" +
-			"\n        .+/golang.org/x/xerrors/fmt_test.go:1\\d\\d",
-		regexp: true,
-	}, {
 		err:  simple,
 		fmt:  "%s",
 		want: "simple",
@@ -162,7 +156,7 @@ func TestErrorFormatter(t *testing.T) {
 		fmt: "%+v",
 		want: "something:" +
 			"\n    golang.org/x/xerrors_test.TestErrorFormatter" +
-			"\n        .+/fmt_test.go:9\\d" +
+			"\n        .+/fmt_test.go:97" +
 			"\n    something more",
 		regexp: true,
 	}, {
@@ -179,10 +173,7 @@ func TestErrorFormatter(t *testing.T) {
 		// Note: no colon after the last error, as there are no details.
 		want: "fallback:" +
 			"\n    somefile.go:123" +
-			"\n  - file does not exist:" +
-			"\n    golang.org/x/xerrors_test.TestErrorFormatter" +
-			"\n        .+/golang.org/x/xerrors/fmt_test.go:9\\d",
-		regexp: true,
+			"\n  - file does not exist",
 	}, {
 		err:  opaque,
 		fmt:  "%s",
@@ -290,12 +281,12 @@ func TestErrorFormatter(t *testing.T) {
 		err:  simple,
 		fmt:  "%T",
 		want: "*xerrors_test.wrapped",
-		// }, {
-		// 	// The behavior for this case is different between go1.12 and go1.13.
-		// 	err:  simple,
-		// 	fmt:  "%🤪",
-		// 	want: "%!🤪(*xerrors_test.wrapped=&{simple <nil>})", // go1.12
-		// 	want: "&{%!🤪(string=simple) <nil>}",                // go1.13
+	}, {
+		err:  simple,
+		fmt:  "%🤪",
+		want: "%!🤪(*xerrors_test.wrapped)",
+		// For 1.13:
+		//  want: "%!🤪(*xerrors_test.wrapped=&{simple <nil>})",
 	}, {
 		err:  formatError("use fmt.Formatter"),
 		fmt:  "%#v",

diff --git a/format_go1_12.go → format.go b/format_go1_12.go → format.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !go1.13
-
 package xerrors
 
 // A Formatter formats error messages.

diff --git a/format_go1_13.go b/format_go1_13.go
diff --git a/frame_go1_12.go → frame.go b/frame_go1_12.go → frame.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !go1.13
-
 package xerrors
 
 import (