use e5

alias.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/reusee/e4"
+	"github.com/reusee/e5"
 )
 
 type (
@@ -15,7 +15,7 @@ var (
 	pt    = fmt.Printf
 	as    = errors.As
 	is    = errors.Is
-	he    = e4.Handle
-	we    = e4.Wrap
-	throw = e4.Throw
+	he    = e5.Handle
+	we    = e5.Wrap
+	throw = e5.Throw
 )

call_result.go

@@ -3,7 +3,7 @@ package dscope
 import (
 	"reflect"
 
-	"github.com/reusee/e4"
+	"github.com/reusee/e5"
 )
 
 type CallResult struct {
@@ -19,14 +19,14 @@ func (c CallResult) Extract(targets ...any) {
 		targetValue := reflect.ValueOf(target)
 		if targetValue.Kind() != reflect.Ptr {
 			panic(we.With(
-				e4.Info("%T is not a pointer", target),
+				e5.Info("%T is not a pointer", target),
 			)(
 				ErrBadArgument,
 			))
 		}
 		if targetValue.Type().Elem() != c.Values[i].Type() {
 			panic(we.With(
-				e4.Info("%T is not a pointer to %v",
+				e5.Info("%T is not a pointer to %v",
 					target,
 					targetValue.Type().Elem()),
 			)(
@@ -45,7 +45,7 @@ func (c CallResult) Assign(targets ...any) {
 		targetValue := reflect.ValueOf(target)
 		if targetValue.Kind() != reflect.Ptr {
 			panic(we.With(
-				e4.Info("%v is not a pointer", target),
+				e5.Info("%v is not a pointer", target),
 			)(
 				ErrBadArgument,
 			))

dscope.go

@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/reusee/e4"
+	"github.com/reusee/e5"
 	"github.com/reusee/pr"
 )
 
@@ -102,7 +102,7 @@ func (scope Scope) Assign(objs ...any) {
 		v := reflect.ValueOf(o)
 		if v.Kind() != reflect.Ptr {
 			throw(we.With(
-				e4.Info("%T is not a pointer", o),
+				e5.Info("%T is not a pointer", o),
 			)(
 				ErrBadArgument,
 			))
@@ -136,7 +136,7 @@ func (scope Scope) get(id _TypeID, t reflect.Type) (
 		value, ok := scope.values.LoadOne(id)
 		if !ok {
 			return ret, we.With(
-				e4.Info("no definition for %v", t),
+				e5.Info("no definition for %v", t),
 			)(
 				ErrDependencyNotFound,
 			)

fork.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/reusee/e4"
+	"github.com/reusee/e5"
 )
 
 type _Forker struct {
@@ -51,7 +51,7 @@ func newForker(
 			numOut := defType.NumOut()
 			if numOut == 0 {
 				throw(we.With(
-					e4.Info("%T returns nothing", def),
+					e5.Info("%T returns nothing", def),
 				)(
 					ErrBadArgument,
 				))
@@ -99,7 +99,7 @@ func newForker(
 
 		default:
 			throw(we.With(
-				e4.Info("%T is not a valid definition", def),
+				e5.Info("%T is not a valid definition", def),
 			)(
 				ErrBadArgument,
 			))
@@ -133,16 +133,16 @@ func newForker(
 		color := colors[id]
 		if color == 1 {
 			return we.With(
-				e4.Info("found dependency loop in definition %v", values[0].DefType),
-				func() e4.WrapFunc {
+				e5.Info("found dependency loop in definition %v", values[0].DefType),
+				func() e5.WrapFunc {
 					buf := new(strings.Builder)
 					for i, id := range path {
 						if i > 0 {
 							buf.WriteString(" -> ")
 						}
 						buf.WriteString(typeIDToType(id).String())
 					}
-					return e4.Info("path: %s", buf.String())
+					return e5.Info("path: %s", buf.String())
 				}(),
 			)(
 				ErrDependencyLoop,
@@ -167,8 +167,8 @@ func newForker(
 					value2, ok := valuesTemplate.Load(id2)
 					if !ok {
 						return we.With(
-							e4.Info("dependency not found in definition %v", value.DefType),
-							e4.Info("no definition for %v", requiredType),
+							e5.Info("dependency not found in definition %v", value.DefType),
+							e5.Info("no definition for %v", requiredType),
 						)(
 							ErrDependencyNotFound,
 						)
@@ -213,7 +213,7 @@ func newForker(
 			t := typeIDToType(values[0].TypeID)
 			if getReducerType(t) == nil {
 				return we.With(
-					e4.Info("%v has multiple definitions", t),
+					e5.Info("%v has multiple definitions", t),
 				)(
 					ErrBadDefinition,
 				)

go.mod

@@ -3,6 +3,6 @@ module github.com/reusee/dscope
 go 1.18
 
 require (
-	github.com/reusee/e4 v0.0.0-20220624024633-9eab321f05d6
-	github.com/reusee/pr v0.0.0-20220624024755-23e64bd7728c
+	github.com/reusee/e5 v0.0.0-20220902143513-42365073754d
+	github.com/reusee/pr v0.0.0-20220902144504-5f8b9d810f6f
 )

go.sum

@@ -1,4 +1,4 @@
-github.com/reusee/e4 v0.0.0-20220624024633-9eab321f05d6 h1:HG863jGFtcMuLte70apB3jC7lvgiTSWUnoHuDa9S0+A=
-github.com/reusee/e4 v0.0.0-20220624024633-9eab321f05d6/go.mod h1:kZmlM15C4htN/zwSQz5HJPQo8BCZY5NnmkyZBDqjwc4=
-github.com/reusee/pr v0.0.0-20220624024755-23e64bd7728c h1:1yv1SCRQTrs0l6Sr2gHry5uOCAE3zEXmgmjXieH8RF4=
-github.com/reusee/pr v0.0.0-20220624024755-23e64bd7728c/go.mod h1:P5LL5BRHQGKJjYiV77MzYpmB+7V8BUAbEzaUmKELuMk=
+github.com/reusee/e5 v0.0.0-20220902143513-42365073754d h1:Hbb0lWLMOmVl8p3KwsXLH8rKqJtHKhIEB7BTbZbvxm0=
+github.com/reusee/e5 v0.0.0-20220902143513-42365073754d/go.mod h1:kfVSDXYZocDqR1uRQfewKHmcLa/QtjGl/Ik0/vqhZ4s=
+github.com/reusee/pr v0.0.0-20220902144504-5f8b9d810f6f h1:mDDBdR+d2CvQjjm9EKEtVJqva9BSr4Aot6WpLv2h9jc=
+github.com/reusee/pr v0.0.0-20220902144504-5f8b9d810f6f/go.mod h1:ByEquMmqXZQzG7VHsfuwgutPe/utoaaDJS9VJJ46uik=

initializer.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/reusee/e4"
+	"github.com/reusee/e5"
 )
 
 type _Initializer struct {
@@ -33,8 +33,8 @@ func (i *_Initializer) get(scope Scope) (ret []reflect.Value, err error) {
 			continue
 		}
 		return nil, we.With(
-			e4.Info("found dependency loop when calling %T", i.Def),
-			e4.Info("path: %+v", scope.path),
+			e5.Info("found dependency loop when calling %T", i.Def),
+			e5.Info("path: %+v", scope.path),
 		)(
 			ErrDependencyLoop,
 		)