Skip to content

Commit

Permalink
Update toolexec-test
Browse files Browse the repository at this point in the history
 * main: toolexec rewrite expected
 * p1: no import, no rewrite
 * p2: already wrapped
 * p3: toolexec rewrite expected
  • Loading branch information
prashantv committed Feb 18, 2024
1 parent dc084a0 commit d2760af
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/errtrace/testdata/toolexec-test/p1/p1.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ import (

// WrapP2 wraps an error return from p2.
func WrapP2() error {
return fmt.Errorf("test2: %w", p2.ReturnErr())
return fmt.Errorf("test2: %w", p2.CallP3())
}
10 changes: 5 additions & 5 deletions cmd/errtrace/testdata/toolexec-test/p2/p2.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package p2

import (
"errors"

"braces.dev/errtrace"

"braces.dev/errtrace/cmd/errtrace/testdata/toolexec-test/p3"
)

// ReturnErr returns an error.
func ReturnErr() error {
return errtrace.Wrap(errors.New("test")) // @trace
// CallP3 calls p3, and wraps the error.
func CallP3() error {
return errtrace.Wrap(p3.ReturnErr()) // @trace
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package p2
package p3

// Opt-in to errtrace wrapping with toolexec.
import _ "braces.dev/errtrace"
10 changes: 10 additions & 0 deletions cmd/errtrace/testdata/toolexec-test/p3/p3.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package p3

import (
"errors"
)

// ReturnErr returns an error.
func ReturnErr() error {
return errors.New("test") // @trace
}

0 comments on commit d2760af

Please sign in to comment.