internal/fudgepb: Make tests work on other archs

rossmacarthur · rossmacarthur · commit 07f9b8b1169f · 2023-05-13T20:48:32.000+02:00
diff --git a/go.mod b/go.mod
@@ -3,14 +3,14 @@ module github.com/rossmacarthur/fudge
 go 1.20
 
 require (
+	github.com/dave/dst v0.27.2
 	github.com/sebdah/goldie/v2 v2.5.3
 	github.com/stretchr/testify v1.8.2
 	google.golang.org/grpc v1.53.0
 	google.golang.org/protobuf v1.29.1
 )
 
 require (
-	github.com/dave/dst v0.27.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
diff --git a/go.sum b/go.sum
@@ -1,6 +1,7 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/dave/dst v0.27.2 h1:4Y5VFTkhGLC1oddtNwuxxe36pnyLxMFXT51FOzH8Ekc=
 github.com/dave/dst v0.27.2/go.mod h1:jHh6EOibnHgcUW3WjKHisiooEkYwqpHLBSX1iOBhEyc=
+github.com/dave/jennifer v1.5.0 h1:HmgPN93bVDpkQyYbqhCHj5QlgvUkvEOzMyEvKLgCRrg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -42,6 +43,7 @@ golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
diff --git a/internal/fudgepb/fudgepb_test.go b/internal/fudgepb/fudgepb_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/rossmacarthur/fudge/errors"
 	"github.com/sebdah/goldie/v2"
 	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
 )
 
 var errSentinel = errors.Sentinel("such test", "TEST1234")
@@ -52,9 +51,9 @@ func TestFromProto(t *testing.T) {
 								Line:     1576,
 							},
 							{
-								File:     "runtime/asm_arm64.s",
+								File:     "runtime/asm_arch.s",
 								Function: "goexit",
-								Line:     1172,
+								Line:     1337,
 							},
 						},
 					},
@@ -81,9 +80,9 @@ func TestFromProto(t *testing.T) {
 								Line:     1576,
 							},
 							{
-								File:     "runtime/asm_arm64.s",
+								File:     "runtime/asm_arch.s",
 								Function: "goexit",
-								Line:     1172,
+								Line:     1337,
 							},
 						},
 					},
@@ -109,9 +108,9 @@ func TestFromProto(t *testing.T) {
 								Line:     1576,
 							},
 							{
-								File:     "runtime/asm_arm64.s",
+								File:     "runtime/asm_arch.s",
 								Function: "goexit",
-								Line:     1172,
+								Line:     1337,
 							},
 						},
 					},
@@ -150,9 +149,9 @@ func TestFromProto(t *testing.T) {
 								Line:     1576,
 							},
 							{
-								File:     "runtime/asm_arm64.s",
+								File:     "runtime/asm_arch.s",
 								Function: "goexit",
-								Line:     1172,
+								Line:     1337,
 							},
 						},
 					},
@@ -178,6 +177,12 @@ func TestFromProto(t *testing.T) {
 }
 
 func TestToProto(t *testing.T) {
+	dummyFrame := &Frame{
+		File:     "runtime/asm_arch.s",
+		Function: "goexit",
+		Line:     1337,
+	}
+
 	tests := []struct {
 		name  string
 		errFn func() error
@@ -239,9 +244,12 @@ func TestToProto(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := ToProto(tt.errFn())
-			bytes, err := protojson.MarshalOptions{Multiline: true}.Marshal(got)
-			require.Nil(t, err)
-			g.Assert(t, tt.name, bytes)
+			for _, hop := range got.Hops {
+				if len(hop.Trace) > 0 {
+					hop.Trace[len(hop.Trace)-1] = dummyFrame
+				}
+			}
+			g.AssertJson(t, tt.name, got)
 		})
 	}
 }
diff --git a/internal/fudgepb/testdata/TestFromProto/one fudge hop.golden b/internal/fudgepb/testdata/TestFromProto/one fudge hop.golden
@@ -1,4 +1,4 @@
 such test
 github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go:24 TestFromProto
 testing/testing.go:1576 tRunner
-runtime/asm_arm64.s:1172 goexit
+runtime/asm_arch.s:1337 goexit
diff --git a/internal/fudgepb/testdata/TestFromProto/two fudge hops.golden b/internal/fudgepb/testdata/TestFromProto/two fudge hops.golden
@@ -1,4 +1,4 @@
 this hop: very wrap: such test
 github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go:52 TestFromProto
 testing/testing.go:1576 tRunner
-runtime/asm_arm64.s:1172 goexit
+runtime/asm_arch.s:1337 goexit
diff --git a/internal/fudgepb/testdata/TestToProto/fudge sentinel.golden b/internal/fudgepb/testdata/TestToProto/fudge sentinel.golden
@@ -8,23 +8,23 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func8",
-          "line": 222,
+          "line": 227,
           "message": "very wrap"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     }
diff --git a/internal/fudgepb/testdata/TestToProto/fudge with kvs.golden b/internal/fudgepb/testdata/TestToProto/fudge with kvs.golden
@@ -7,9 +7,9 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func7",
-          "line": 215,
+          "line": 220,
           "message": "such test",
-          "keyValues": [
+          "key_values": [
             {
               "key": "hello",
               "value": "world"
@@ -19,9 +19,9 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func7",
-          "line": 216,
+          "line": 221,
           "message": "very wrap",
-          "keyValues": [
+          "key_values": [
             {
               "key": "foo",
               "value": "bar"
@@ -31,17 +31,17 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     }
diff --git a/internal/fudgepb/testdata/TestToProto/fudge wrapped.golden b/internal/fudgepb/testdata/TestToProto/fudge wrapped.golden
@@ -7,29 +7,29 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func6",
-          "line": 208,
+          "line": 213,
           "message": "such test"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func6",
-          "line": 209,
+          "line": 214,
           "message": "very wrap"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     }
diff --git a/internal/fudgepb/testdata/TestToProto/fudge.golden b/internal/fudgepb/testdata/TestToProto/fudge.golden
@@ -7,23 +7,23 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func5",
-          "line": 203,
+          "line": 208,
           "message": "such test"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     }
diff --git a/internal/fudgepb/testdata/TestToProto/std sentinel wrapped.golden b/internal/fudgepb/testdata/TestToProto/std sentinel wrapped.golden
@@ -7,23 +7,23 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func4",
-          "line": 199,
+          "line": 204,
           "message": "very wrap"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     },
diff --git a/internal/fudgepb/testdata/TestToProto/with hops.golden b/internal/fudgepb/testdata/TestToProto/with hops.golden
@@ -7,23 +7,23 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func9",
-          "line": 228,
+          "line": 233,
           "message": "this hop"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     },
@@ -35,23 +35,23 @@
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func9",
-          "line": 231,
+          "line": 236,
           "message": "very wrap"
         },
         {
           "file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",
           "function": "TestToProto.func10",
-          "line": 241
+          "line": 246
         },
         {
           "file": "testing/testing.go",
           "function": "tRunner",
           "line": 1576
         },
         {
-          "file": "runtime/asm_arm64.s",
+          "file": "runtime/asm_arch.s",
           "function": "goexit",
-          "line": 1172
+          "line": 1337
         }
       ]
     }
diff --git a/internal/stack/stack.go b/internal/stack/stack.go
@@ -12,6 +12,7 @@ type Frame struct {
 	Line     int
 }
 
+// Trace returns a stack trace, skipping the given number of frames
 func Trace(skip int) []Frame {
 	var pcs [512]uintptr
 	n := runtime.Callers(skip+1, pcs[:])
@@ -29,6 +30,7 @@ func Trace(skip int) []Frame {
 	return trace
 }
 
+// Call returns the frame of the caller, skipping the given number of frames
 func Call(skip int) Frame {
 	var pcs [3]uintptr
 	n := runtime.Callers(skip+1, pcs[:])

Original file line number	Diff line number	Diff line change
`@@ -8,23 +8,23 @@`
`8`	`8`	`{`
`9`	`9`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`10`	`10`	`"function": "TestToProto.func8",`
`11`		`- "line": 222,`
	`11`	`+ "line": 227,`
`12`	`12`	`"message": "very wrap"`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`16`	`16`	`"function": "TestToProto.func10",`
`17`		`- "line": 241`
	`17`	`+ "line": 246`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`"file": "testing/testing.go",`
`21`	`21`	`"function": "tRunner",`
`22`	`22`	`"line": 1576`
`23`	`23`	`},`
`24`	`24`	`{`
`25`		`- "file": "runtime/asm_arm64.s",`
	`25`	`+ "file": "runtime/asm_arch.s",`
`26`	`26`	`"function": "goexit",`
`27`		`- "line": 1172`
	`27`	`+ "line": 1337`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`{`
`8`	`8`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`9`	`9`	`"function": "TestToProto.func7",`
`10`		`- "line": 215,`
	`10`	`+ "line": 220,`
`11`	`11`	`"message": "such test",`
`12`		`- "keyValues": [`
	`12`	`+ "key_values": [`
`13`	`13`	`{`
`14`	`14`	`"key": "hello",`
`15`	`15`	`"value": "world"`
`@@ -19,9 +19,9 @@`
`19`	`19`	`{`
`20`	`20`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`21`	`21`	`"function": "TestToProto.func7",`
`22`		`- "line": 216,`
	`22`	`+ "line": 221,`
`23`	`23`	`"message": "very wrap",`
`24`		`- "keyValues": [`
	`24`	`+ "key_values": [`
`25`	`25`	`{`
`26`	`26`	`"key": "foo",`
`27`	`27`	`"value": "bar"`
`@@ -31,17 +31,17 @@`
`31`	`31`	`{`
`32`	`32`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`33`	`33`	`"function": "TestToProto.func10",`
`34`		`- "line": 241`
	`34`	`+ "line": 246`
`35`	`35`	`},`
`36`	`36`	`{`
`37`	`37`	`"file": "testing/testing.go",`
`38`	`38`	`"function": "tRunner",`
`39`	`39`	`"line": 1576`
`40`	`40`	`},`
`41`	`41`	`{`
`42`		`- "file": "runtime/asm_arm64.s",`
	`42`	`+ "file": "runtime/asm_arch.s",`
`43`	`43`	`"function": "goexit",`
`44`		`- "line": 1172`
	`44`	`+ "line": 1337`
`45`	`45`	`}`
`46`	`46`	`]`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,29 +7,29 @@`
`7`	`7`	`{`
`8`	`8`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`9`	`9`	`"function": "TestToProto.func6",`
`10`		`- "line": 208,`
	`10`	`+ "line": 213,`
`11`	`11`	`"message": "such test"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`15`	`15`	`"function": "TestToProto.func6",`
`16`		`- "line": 209,`
	`16`	`+ "line": 214,`
`17`	`17`	`"message": "very wrap"`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`21`	`21`	`"function": "TestToProto.func10",`
`22`		`- "line": 241`
	`22`	`+ "line": 246`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"file": "testing/testing.go",`
`26`	`26`	`"function": "tRunner",`
`27`	`27`	`"line": 1576`
`28`	`28`	`},`
`29`	`29`	`{`
`30`		`- "file": "runtime/asm_arm64.s",`
	`30`	`+ "file": "runtime/asm_arch.s",`
`31`	`31`	`"function": "goexit",`
`32`		`- "line": 1172`
	`32`	`+ "line": 1337`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,23 @@`
`7`	`7`	`{`
`8`	`8`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`9`	`9`	`"function": "TestToProto.func5",`
`10`		`- "line": 203,`
	`10`	`+ "line": 208,`
`11`	`11`	`"message": "such test"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`15`	`15`	`"function": "TestToProto.func10",`
`16`		`- "line": 241`
	`16`	`+ "line": 246`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"file": "testing/testing.go",`
`20`	`20`	`"function": "tRunner",`
`21`	`21`	`"line": 1576`
`22`	`22`	`},`
`23`	`23`	`{`
`24`		`- "file": "runtime/asm_arm64.s",`
	`24`	`+ "file": "runtime/asm_arch.s",`
`25`	`25`	`"function": "goexit",`
`26`		`- "line": 1172`
	`26`	`+ "line": 1337`
`27`	`27`	`}`
`28`	`28`	`]`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,23 @@`
`7`	`7`	`{`
`8`	`8`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`9`	`9`	`"function": "TestToProto.func4",`
`10`		`- "line": 199,`
	`10`	`+ "line": 204,`
`11`	`11`	`"message": "very wrap"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`15`	`15`	`"function": "TestToProto.func10",`
`16`		`- "line": 241`
	`16`	`+ "line": 246`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"file": "testing/testing.go",`
`20`	`20`	`"function": "tRunner",`
`21`	`21`	`"line": 1576`
`22`	`22`	`},`
`23`	`23`	`{`
`24`		`- "file": "runtime/asm_arm64.s",`
	`24`	`+ "file": "runtime/asm_arch.s",`
`25`	`25`	`"function": "goexit",`
`26`		`- "line": 1172`
	`26`	`+ "line": 1337`
`27`	`27`	`}`
`28`	`28`	`]`
`29`	`29`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,23 @@`
`7`	`7`	`{`
`8`	`8`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`9`	`9`	`"function": "TestToProto.func9",`
`10`		`- "line": 228,`
	`10`	`+ "line": 233,`
`11`	`11`	`"message": "this hop"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`15`	`15`	`"function": "TestToProto.func10",`
`16`		`- "line": 241`
	`16`	`+ "line": 246`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"file": "testing/testing.go",`
`20`	`20`	`"function": "tRunner",`
`21`	`21`	`"line": 1576`
`22`	`22`	`},`
`23`	`23`	`{`
`24`		`- "file": "runtime/asm_arm64.s",`
	`24`	`+ "file": "runtime/asm_arch.s",`
`25`	`25`	`"function": "goexit",`
`26`		`- "line": 1172`
	`26`	`+ "line": 1337`
`27`	`27`	`}`
`28`	`28`	`]`
`29`	`29`	`},`
`@@ -35,23 +35,23 @@`
`35`	`35`	`{`
`36`	`36`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`37`	`37`	`"function": "TestToProto.func9",`
`38`		`- "line": 231,`
	`38`	`+ "line": 236,`
`39`	`39`	`"message": "very wrap"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"file": "github.com/rossmacarthur/fudge/internal/fudgepb/fudgepb_test.go",`
`43`	`43`	`"function": "TestToProto.func10",`
`44`		`- "line": 241`
	`44`	`+ "line": 246`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"file": "testing/testing.go",`
`48`	`48`	`"function": "tRunner",`
`49`	`49`	`"line": 1576`
`50`	`50`	`},`
`51`	`51`	`{`
`52`		`- "file": "runtime/asm_arm64.s",`
	`52`	`+ "file": "runtime/asm_arch.s",`
`53`	`53`	`"function": "goexit",`
`54`		`- "line": 1172`
	`54`	`+ "line": 1337`
`55`	`55`	`}`
`56`	`56`	`]`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ type Frame struct {`
`12`	`12`	`Line int`
`13`	`13`	`}`
`14`	`14`
	`15`	`+// Trace returns a stack trace, skipping the given number of frames`
`15`	`16`	`func Trace(skip int) []Frame {`
`16`	`17`	`var pcs [512]uintptr`
`17`	`18`	`n := runtime.Callers(skip+1, pcs[:])`
`@@ -29,6 +30,7 @@ func Trace(skip int) []Frame {`
`29`	`30`	`return trace`
`30`	`31`	`}`
`31`	`32`
	`33`	`+// Call returns the frame of the caller, skipping the given number of frames`
`32`	`34`	`func Call(skip int) Frame {`
`33`	`35`	`var pcs [3]uintptr`
`34`	`36`	`n := runtime.Callers(skip+1, pcs[:])`