summaryrefslogtreecommitdiff
path: root/vendor/github.com/mitchellh/mapstructure/mapstructure.go
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2018-07-30 23:50:12 -0400
committerGitHub <noreply@github.com>2018-07-30 23:50:12 -0400
commitfbb3f3f9dde228494b8d91698d7e11b749d2b88e (patch)
tree42f1eb1eae59a1449915642e14ca8b5e2f7234ab /vendor/github.com/mitchellh/mapstructure/mapstructure.go
parent54403e50707b8423bd22349bb380d5eab4af25db (diff)
parent7122741a6a1da16b39f1cef3cc99d0eab853a34c (diff)
Merge pull request #367 from hairyhenderson/update-dep
Updating dep to 0.5.0
Diffstat (limited to 'vendor/github.com/mitchellh/mapstructure/mapstructure.go')
-rw-r--r--vendor/github.com/mitchellh/mapstructure/mapstructure.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/vendor/github.com/mitchellh/mapstructure/mapstructure.go b/vendor/github.com/mitchellh/mapstructure/mapstructure.go
index 13cc5e3d..d3222b8f 100644
--- a/vendor/github.com/mitchellh/mapstructure/mapstructure.go
+++ b/vendor/github.com/mitchellh/mapstructure/mapstructure.go
@@ -762,6 +762,9 @@ func (d *Decoder) decodeSlice(name string, data interface{}, val reflect.Value)
val.Set(reflect.MakeSlice(sliceType, 0, 0))
return nil
}
+ // Create slice of maps of other sizes
+ return d.decodeSlice(name, []interface{}{data}, val)
+
case dataValKind == reflect.String && valElemType.Kind() == reflect.Uint8:
return d.decodeSlice(name, []byte(dataVal.String()), val)
// All other types we try to convert to the slice type