Fix maps race in append and merge tests
This commit is contained in:
parent
9013777279
commit
47529f829e
|
@ -15,13 +15,18 @@ func Append(c1, c2 *Config) (*Config, error) {
|
|||
// Append unknown keys, but keep them unique since it is a set
|
||||
unknowns := make(map[string]struct{})
|
||||
for _, k := range c1.unknownKeys {
|
||||
unknowns[k] = struct{}{}
|
||||
_, present := unknowns[k]
|
||||
if !present {
|
||||
unknowns[k] = struct{}{}
|
||||
c.unknownKeys = append(c.unknownKeys, k)
|
||||
}
|
||||
}
|
||||
for _, k := range c2.unknownKeys {
|
||||
unknowns[k] = struct{}{}
|
||||
}
|
||||
for k, _ := range unknowns {
|
||||
c.unknownKeys = append(c.unknownKeys, k)
|
||||
_, present := unknowns[k]
|
||||
if !present {
|
||||
unknowns[k] = struct{}{}
|
||||
c.unknownKeys = append(c.unknownKeys, k)
|
||||
}
|
||||
}
|
||||
|
||||
if len(c1.Outputs) > 0 || len(c2.Outputs) > 0 {
|
||||
|
|
|
@ -11,13 +11,18 @@ func Merge(c1, c2 *Config) (*Config, error) {
|
|||
// Merge unknown keys
|
||||
unknowns := make(map[string]struct{})
|
||||
for _, k := range c1.unknownKeys {
|
||||
unknowns[k] = struct{}{}
|
||||
_, present := unknowns[k]
|
||||
if !present {
|
||||
unknowns[k] = struct{}{}
|
||||
c.unknownKeys = append(c.unknownKeys, k)
|
||||
}
|
||||
}
|
||||
for _, k := range c2.unknownKeys {
|
||||
unknowns[k] = struct{}{}
|
||||
}
|
||||
for k, _ := range unknowns {
|
||||
c.unknownKeys = append(c.unknownKeys, k)
|
||||
_, present := unknowns[k]
|
||||
if !present {
|
||||
unknowns[k] = struct{}{}
|
||||
c.unknownKeys = append(c.unknownKeys, k)
|
||||
}
|
||||
}
|
||||
|
||||
// NOTE: Everything below is pretty gross. Due to the lack of generics
|
||||
|
|
Loading…
Reference in New Issue