all: gofmt -w -r 'interface{} -> any' .

Updates #9687
This commit is contained in:
Bjørn Erik Pedersen
2022-03-17 22:03:27 +01:00
parent 423594e03a
commit b80853de90
342 changed files with 2118 additions and 2102 deletions

View File

@@ -102,7 +102,7 @@ type Transformer interface {
Transform(...ResourceTransformation) (ResourceTransformer, error)
}
func NewFeatureNotAvailableTransformer(key string, elements ...interface{}) ResourceTransformation {
func NewFeatureNotAvailableTransformer(key string, elements ...any) ResourceTransformation {
return transformerNotAvailable{
key: internal.NewResourceTransformationKey(key, elements...),
}
@@ -163,11 +163,11 @@ type commonResource struct {
// Slice is not meant to be used externally. It's a bridge function
// for the template functions. See collections.Slice.
func (commonResource) Slice(in interface{}) (interface{}, error) {
func (commonResource) Slice(in any) (any, error) {
switch items := in.(type) {
case resource.Resources:
return items, nil
case []interface{}:
case []any:
groups := make(resource.Resources, len(items))
for i, v := range items {
g, ok := v.(resource.Resource)
@@ -214,8 +214,8 @@ type genericResource struct {
title string
name string
params map[string]interface{}
data map[string]interface{}
params map[string]any
data map[string]any
resourceType string
mediaType media.Type
@@ -225,7 +225,7 @@ func (l *genericResource) Clone() resource.Resource {
return l.clone()
}
func (l *genericResource) Content() (interface{}, error) {
func (l *genericResource) Content() (any, error) {
if err := l.initContent(); err != nil {
return nil, err
}
@@ -237,7 +237,7 @@ func (r *genericResource) Err() error {
return nil
}
func (l *genericResource) Data() interface{} {
func (l *genericResource) Data() any {
return l.data
}
@@ -382,12 +382,12 @@ func (r *genericResource) tryTransformedFileCache(key string, u *transformationU
return f
}
func (r *genericResource) mergeData(in map[string]interface{}) {
func (r *genericResource) mergeData(in map[string]any) {
if len(in) == 0 {
return
}
if r.data == nil {
r.data = make(map[string]interface{})
r.data = make(map[string]any)
}
for k, v := range in {
if _, found := r.data[k]; !found {
@@ -539,7 +539,7 @@ func (l *genericResource) relTargetPathsForRel(rel string) []string {
return targetPaths
}
func (l *genericResource) updateParams(params map[string]interface{}) {
func (l *genericResource) updateParams(params map[string]any) {
if l.params == nil {
l.params = params
return