diff --git a/.travis.yml b/.travis.yml index 7f09f65..c1825be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: go go: - - 1.6 + - "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: 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 {