Merge branch 'master' into 'cli-inception'

Author: cmaglie

dump_build_properties.go

@@ -30,18 +30,18 @@
 package builder
 
 import (
-	"github.com/arduino/arduino-builder/types"
-	"github.com/arduino/arduino-builder/utils"
 	"fmt"
 	"sort"
+
+	"github.com/arduino/arduino-builder/types"
 )
 
 type DumpBuildProperties struct{}
 
 func (s *DumpBuildProperties) Run(ctx *types.Context) error {
 	buildProperties := ctx.BuildProperties
 
-	keys := utils.KeysOfMapOfString(buildProperties)
+	keys := buildProperties.Keys()
 	sort.Strings(keys)
 
 	for _, key := range keys {

platform_keys_rewrite_loader.go

@@ -39,7 +39,6 @@ import (
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/arduino/arduino-builder/utils"
 	"github.com/arduino/go-properties-map"
 )
 
@@ -63,7 +62,7 @@ func (s *PlatformKeysRewriteLoader) Run(ctx *types.Context) error {
 	if err != nil {
 		return i18n.WrapError(err)
 	}
-	keys := utils.KeysOfMapOfString(txt)
+	keys := txt.Keys()
 	sort.Strings(keys)
 
 	for _, key := range keys {

utils/utils.go

@@ -53,14 +53,6 @@ import (
 	"golang.org/x/text/unicode/norm"
 )
 
-func KeysOfMapOfString(input map[string]string) []string {
-	var keys []string
-	for key, _ := range input {
-		keys = append(keys, key)
-	}
-	return keys
-}
-
 func PrettyOSName() string {
 	switch osName := runtime.GOOS; osName {
 	case "darwin":