File tree Expand file tree Collapse file tree 6 files changed +27
-24
lines changed Expand file tree Collapse file tree 6 files changed +27
-24
lines changed Original file line number Diff line number Diff line change @@ -57,12 +57,12 @@ func Errorf(msg string, args ...any) Error {
5757 return newError (errors .WrapCaller (fmt .Errorf (msg , args ... ), 1 ))
5858}
5959
60- func ErrProxyOf (err * error ) ErrProxy {
60+ func ErrProxyOf (err * error ) ProxyErr {
6161 if err == nil {
6262 errNilOrPanic (errors .Errorf ("err param is nil" ))
63- return ErrProxy {}
63+ return ProxyErr {}
6464 }
65- return ErrProxy {err : err }
65+ return ProxyErr {err : err }
6666}
6767
6868func ErrOf (err error ) Error {
Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ func (e Error) Expect(format string, args ...any) {
115115
116116func (e Error ) String () string {
117117 if e .IsOK () {
118- return "Ok "
118+ return "OK "
119119 }
120120
121121 return fmt .Sprintf ("Error(%v)" , e .err )
Original file line number Diff line number Diff line change @@ -8,13 +8,16 @@ import (
88 "github.com/pubgo/funk/v2/errors"
99)
1010
11- func AsyncErr (fn func () Error ) * ErrFuture {
11+ func AsyncErr (fn func () Error ) * FutureErr {
1212 if fn == nil {
13- return & ErrFuture {e : errors .WrapCaller (errFnIsNil , 1 )}
13+ return & FutureErr {e : errors .WrapCaller (errFnIsNil , 1 )}
1414 }
1515
1616 future := newErrFuture ()
17- go func () { defer future .close (); future .setErr (try (func () error { return fn ().getErr () })) }()
17+ go func () {
18+ defer future .close ()
19+ future .setErr (try (func () error { return fn ().getErr () }))
20+ }()
1821 return future
1922}
2023
@@ -53,19 +56,19 @@ func (f *Future[T]) Await(ctxL ...context.Context) Result[T] {
5356 }
5457}
5558
56- func newErrFuture () * ErrFuture {
57- return & ErrFuture {done : make (chan struct {})}
59+ func newErrFuture () * FutureErr {
60+ return & FutureErr {done : make (chan struct {})}
5861}
5962
60- type ErrFuture struct {
63+ type FutureErr struct {
6164 e error
6265 done chan struct {}
6366}
6467
65- func (f * ErrFuture ) close () { close (f .done ) }
66- func (f * ErrFuture ) setErr (err error ) { f .e = err }
68+ func (f * FutureErr ) close () { close (f .done ) }
69+ func (f * FutureErr ) setErr (err error ) { f .e = err }
6770
68- func (f * ErrFuture ) Await (ctxL ... context.Context ) Error {
71+ func (f * FutureErr ) Await (ctxL ... context.Context ) Error {
6972 ctx := lo .FirstOr (ctxL , context .Background ())
7073 select {
7174 case <- f .done :
Original file line number Diff line number Diff line change @@ -6,31 +6,31 @@ import (
66 "github.com/samber/lo"
77)
88
9- var _ ErrSetter = new (ErrProxy )
9+ var _ ErrSetter = new (ProxyErr )
1010
11- type ErrProxy struct {
11+ type ProxyErr struct {
1212 err * error
1313}
1414
15- func (e ErrProxy ) IsOK () bool {
15+ func (e ProxyErr ) IsOK () bool {
1616 return lo .FromPtr (e .err ) == nil
1717}
1818
19- func (e ErrProxy ) IsErr () bool {
19+ func (e ProxyErr ) IsErr () bool {
2020 return lo .FromPtr (e .err ) != nil
2121}
2222
23- func (e ErrProxy ) GetErr () error {
23+ func (e ProxyErr ) GetErr () error {
2424 return lo .FromPtr (e .err )
2525}
2626
27- func (e ErrProxy ) String () string {
27+ func (e ProxyErr ) String () string {
2828 if e .IsOK () {
29- return "Ok "
29+ return "OK "
3030 }
3131
3232 return fmt .Sprintf ("Error(%v)" , lo .FromPtr (e .err ))
3333}
3434
35- func (e ErrProxy ) setErrorInner () {
35+ func (e ProxyErr ) setErrorInner () {
3636}
Original file line number Diff line number Diff line change @@ -177,7 +177,7 @@ func (r Result[T]) GetErr() error {
177177
178178func (r Result [T ]) String () string {
179179 if r .IsOK () {
180- return fmt .Sprintf ("Ok (%v)" , r .getValue ())
180+ return fmt .Sprintf ("OK (%v)" , r .getValue ())
181181 }
182182 return fmt .Sprintf ("Error(%v)" , r .getErr ())
183183}
Original file line number Diff line number Diff line change @@ -234,9 +234,9 @@ func setError(setter ErrSetter, err error) {
234234 switch errSet := setter .(type ) {
235235 case * Error :
236236 errSet .err = err
237- case * ErrProxy :
237+ case * ProxyErr :
238238 * errSet .err = err
239- case ErrProxy :
239+ case ProxyErr :
240240 * errSet .err = err
241241 default :
242242 rv := reflect .ValueOf (setter )
You can’t perform that action at this time.
0 commit comments