Skip to content

Commit a707c9d

Browse files
committed
func(error) error: is a new handler signature
1 parent 11d92a0 commit a707c9d

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ func CopyFile(src, dst string) (err error) {
2424
if err != nil {
2525
return fmt.Errorf("mixing traditional error checking: %w", err)
2626
}
27-
defer err2.Handle(&err, func() {
27+
defer err2.Handle(&err, err2.Err(func(error) {
2828
os.Remove(dst)
29-
})
29+
}))
3030
defer w.Close()
3131
try.To1(io.Copy(w, r))
3232
return nil

doc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ them. The CopyFile example shows how it works:
3434
w := try.To1(os.Create(dst))
3535
// Add error handler to clean up the destination file. Place it here that
3636
// the next deferred close is called before our Remove call.
37-
defer err2.Handle(&err, func() {
37+
defer err2.Handle(&err, err2.Err(func(error) {
3838
os.Remove(dst)
39-
})
39+
}))
4040
defer w.Close()
4141
4242
// Try to copy the file. If error occurs now, all previous error handlers

scripts/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ todo_handle_func() {
467467

468468
todo_catch_func() {
469469
dlog "searching old error handlers"
470-
ag 'err2\.Catch\(func\(err error\)'
470+
ag 'err2\.Catch\(func\(err error\) \{'
471471
}
472472

473473
lint() {

try/try.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ about err2 and try packager roles can be seen in the FileCopy example:
99
defer r.Close()
1010
1111
w := try.To1(os.Create(dst))
12-
defer err2.Handle(&err, func() {
13-
os.Remove(dst)
12+
defer err2.Handle(&err, func(error) error {
13+
try.To(os.Remove(dst)).Logf()
14+
return nil
1415
})
1516
defer w.Close()
1617
try.To1(io.Copy(w, r))

try/try_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ func Example_copyFile() {
111111
defer r.Close()
112112

113113
w := try.To1(os.Create(dst))
114-
defer err2.Handle(&err, func() {
114+
defer err2.Handle(&err, err2.Err(func(error) {
115115
os.Remove(dst)
116-
})
116+
}))
117117
defer w.Close()
118118
try.To1(io.Copy(w, r))
119119
return nil

0 commit comments

Comments
 (0)