Compare commits

..

No commits in common. "main" and "v0.3.1" have entirely different histories.
main ... v0.3.1

2 changed files with 2 additions and 25 deletions

View file

@ -47,14 +47,7 @@ type call struct {
} }
// FromErr wraps a standard error into a try-compatible one with extended stack info. // FromErr wraps a standard error into a try-compatible one with extended stack info.
func FromErr(err error) Err { func FromErr(err error) *tryErr {
// If the error is already try-compatible, return
//nolint:errorlint
cterr, ok := err.(Err)
if ok {
return cterr
}
terr := &tryErr{err: err, callStack: []call{}} terr := &tryErr{err: err, callStack: []call{}}
pc, _, _, ok := runtime.Caller(0) pc, _, _, ok := runtime.Caller(0)
@ -89,7 +82,7 @@ func FromErr(err error) Err {
} }
// NewErr creates a new try-compatible error with extended stack info. // NewErr creates a new try-compatible error with extended stack info.
func NewErr(msg string) Err { func NewErr(msg string) *tryErr {
return FromErr(errors.New(msg)) return FromErr(errors.New(msg))
} }

View file

@ -220,22 +220,6 @@ func TestReturnStd(t *testing.T) {
} }
} }
func TestCheckTryErr(t *testing.T) {
testErr := NewErr("TestErr")
tf := func() (err Err) {
defer Return(&err)
Check(testErr)
return
}
err := tf()
if err != testErr {
t.Fail()
}
}
func ExampleReturn() { func ExampleReturn() {
var err Err var err Err
defer Return(&err) defer Return(&err)