admin/wire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wire: use providerMap.Iterate instead of providerMap.Keys() + At() (google/go-cloud#265)

Browse Source
This commit is contained in:
Robert van Gent
2018-07-31 10:48:16 -07:00
committed by Ross Light
parent 707f33ee6c
commit b348a78000
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/wire/analyze.go
View File

@@ -240,14 +240,14 @@ func buildProviderMap(fset *token.FileSet, hasher typeutil.Hasher, set *Provider
// Process imports first, verifying that there are no conflicts between sets. // Process imports first, verifying that there are no conflicts between sets.
ec := new(errorCollector) ec := new(errorCollector)
for _, imp := range set.Imports { for _, imp := range set.Imports {
for _, k := range imp.providerMap.Keys() { imp.providerMap.Iterate(func(k types.Type, v interface{}) {
if providerMap.At(k) != nil { if providerMap.At(k) != nil {
ec.add(bindingConflictError(fset, imp.Pos, k, setMap.At(k).(*ProviderSet))) ec.add(bindingConflictError(fset, imp.Pos, k, setMap.At(k).(*ProviderSet)))
continue return
} }
providerMap.Set(k, imp.providerMap.At(k)) providerMap.Set(k, v)
setMap.Set(k, imp) setMap.Set(k, imp)
} })
} }
if len(ec.errors) > 0 { if len(ec.errors) > 0 {
return nil, ec.errors return nil, ec.errors