From f51ccf2cf88e5c1f153415b6c7dc710e8e8f0e25 Mon Sep 17 00:00:00 2001 From: jiexiaoyu <327681132@qq.com> Date: Sun, 20 May 2018 17:51:31 +0800 Subject: [PATCH 1/7] unnamedType uses struct{} to use less memory --- inject.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inject.go b/inject.go index 300b9a3..343b5ed 100644 --- a/inject.go +++ b/inject.go @@ -86,7 +86,7 @@ func (o *Object) addDep(field string, dep *Object) { type Graph struct { Logger Logger // Optional, will trigger debug logging. unnamed []*Object - unnamedType map[reflect.Type]bool + unnamedType map[reflect.Type]struct{} named map[string]*Object } @@ -116,16 +116,16 @@ func (g *Graph) Provide(objects ...*Object) error { if !o.private { if g.unnamedType == nil { - g.unnamedType = make(map[reflect.Type]bool) + g.unnamedType = make(map[reflect.Type]struct{}) } - if g.unnamedType[o.reflectType] { + if _, ok := g.unnamedType[o.reflectType]; ok { return fmt.Errorf( "provided two unnamed instances of type *%s.%s", o.reflectType.Elem().PkgPath(), o.reflectType.Elem().Name(), ) } - g.unnamedType[o.reflectType] = true + g.unnamedType[o.reflectType] = struct{}{} } g.unnamed = append(g.unnamed, o) } else { From af10955f6808fdf4a5df9bc18f894c42710c5672 Mon Sep 17 00:00:00 2001 From: delveshal <327681132@qq.com> Date: Sun, 20 May 2018 18:26:49 +0800 Subject: [PATCH 2/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f09f65..5933e08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.6 + - 1.10 before_install: - go get -v github.com/golang/lint/golint From 154f50ebe10ccd5ef887f3e9123ebdf65675f61c Mon Sep 17 00:00:00 2001 From: delveshal <327681132@qq.com> Date: Sun, 20 May 2018 18:34:41 +0800 Subject: [PATCH 3/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5933e08..5d0da71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - 1.10 before_install: - - go get -v github.com/golang/lint/golint + - go get -v golang.org/x/lint/golint - go get -v golang.org/x/tools/cmd/cover install: From 56412afd9f3f321a640ba75d58d2fdce925821d9 Mon Sep 17 00:00:00 2001 From: delveshal <327681132@qq.com> Date: Sun, 20 May 2018 18:37:17 +0800 Subject: [PATCH 4/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d0da71..9a1b353 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - 1.10 before_install: - - go get -v golang.org/x/lint/golint + - go get -v -u golang.org/x/lint/golint - go get -v golang.org/x/tools/cmd/cover install: From 650ef3c3c097e38da31b9794fd0c0c6972bd0054 Mon Sep 17 00:00:00 2001 From: delveshal <327681132@qq.com> Date: Sun, 20 May 2018 19:30:22 +0800 Subject: [PATCH 5/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a1b353..a4310f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - 1.10 before_install: - - go get -v -u golang.org/x/lint/golint + - go get -u golang.org/x/lint/golint - go get -v golang.org/x/tools/cmd/cover install: From 3fe4e8cd09629bbcc382d217da87821f1ab8600b Mon Sep 17 00:00:00 2001 From: delveshal <327681132@qq.com> Date: Sun, 20 May 2018 19:43:55 +0800 Subject: [PATCH 6/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a4310f9..fd50480 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.10 + - "1.10" before_install: - go get -u golang.org/x/lint/golint From 614d9b6c647f34bc2009f3b9257df14f86677380 Mon Sep 17 00:00:00 2001 From: delveshal <327681132@qq.com> Date: Sun, 20 May 2018 19:47:07 +0800 Subject: [PATCH 7/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd50480..c1825be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - "1.10" before_install: - - go get -u golang.org/x/lint/golint + - go get -v golang.org/x/lint/golint - go get -v golang.org/x/tools/cmd/cover install: