Skip to content

Commit

Permalink
Merge pull request #327 from redhatrises/packaging_fixes
Browse files Browse the repository at this point in the history
Update use of set.v0 to latest code
  • Loading branch information
shawndwells authored Aug 15, 2018
2 parents 783ae08 + c2b89f6 commit aeb8770
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 74 deletions.
6 changes: 3 additions & 3 deletions pkg/lib/components/versions/3_1_0/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sort"

"github.com/blang/semver"
"github.com/fatih/set"
"github.com/opencontrol/compliance-masonry/pkg/lib/common"
"gopkg.in/fatih/set.v0"
)

// Component struct is an individual component requiring documentation
Expand Down Expand Up @@ -132,7 +132,7 @@ func (s Satisfies) GetControlOrigin() string {

// GetControlOrigins returns all the control origins
func (s Satisfies) GetControlOrigins() []string {
controlOrigins := set.New()
controlOrigins := set.New(set.ThreadSafe)
for i := range s.ControlOrigins {
controlOrigins.Add(s.ControlOrigins[i])
}
Expand All @@ -151,7 +151,7 @@ func (s Satisfies) GetImplementationStatus() string {

// GetImplementationStatuses returns all implementation statuses
func (s Satisfies) GetImplementationStatuses() []string {
implementationStatuses := set.New()
implementationStatuses := set.New(set.ThreadSafe)
for i := range s.ImplementationStatuses {
implementationStatuses.Add(s.ImplementationStatuses[i])
}
Expand Down
4 changes: 2 additions & 2 deletions tools/mapset/map.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package mapset

import (
"errors"
"gopkg.in/fatih/set.v0"
"github.com/fatih/set"
)

// MapSet is the map with each value being a set.
Expand Down Expand Up @@ -39,7 +39,7 @@ func (m *MapSet) Reserve(key string, value string) (result Result) {
}
var innerSet *set.Set
if _, ok := m.mapOfSet[key]; !ok {
innerSet = set.New()
innerSet = set.New(set.ThreadSafe).(*set.Set)
m.mapOfSet[key] = innerSet
}
if m.mapOfSet[key].Has(value) {
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
gopkg.in/fatih/set.v0 master
github.com/fatih/set master
github.com/stretchr/testify master
github.com/stretchr/objx master
github.com/davecgh/go-spew master
Expand Down
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit aeb8770

Please sign in to comment.