Applied suggestion from codereview

Author: cmaglie

legacy/builder/create_cmake_rule.go

@@ -30,16 +30,6 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
 )
 
-func stringArrayToLookupFunction(in []string) func(string) bool {
-	out := map[string]bool{}
-	for _, i := range in {
-		out[i] = true
-	}
-	return func(s string) bool {
-		return out[s]
-	}
-}
-
 type ExportProjectCMake struct {
 	// Was there an error while compiling the sketch?
 	SketchError bool
@@ -81,12 +71,11 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 	cmakeFile := cmakeFolder.Join("CMakeLists.txt")
 
 	dynamicLibsFromPkgConfig := map[string]bool{}
-	extensions := stringArrayToLookupFunction(validExportExtensions)
 	for _, library := range ctx.ImportedLibraries {
 		// Copy used libraries in the correct folder
 		libDir := libBaseFolder.Join(library.Name)
 		mcu := ctx.BuildProperties.Get(constants.BUILD_PROPERTIES_BUILD_MCU)
-		utils.CopyDir(library.InstallDir.String(), libDir.String(), extensions)
+		utils.CopyDir(library.InstallDir.String(), libDir.String(), validExportExtensions)
 
 		// Read cmake options if available
 		isStaticLib := true
@@ -116,11 +105,11 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 	}
 
 	// Copy core + variant in use + preprocessed sketch in the correct folders
-	err := utils.CopyDir(ctx.BuildProperties.Get("build.core.path"), coreFolder.String(), extensions)
+	err := utils.CopyDir(ctx.BuildProperties.Get("build.core.path"), coreFolder.String(), validExportExtensions)
 	if err != nil {
 		fmt.Println(err)
 	}
-	err = utils.CopyDir(ctx.BuildProperties.Get("build.variant.path"), coreFolder.Join("variant").String(), extensions)
+	err = utils.CopyDir(ctx.BuildProperties.Get("build.variant.path"), coreFolder.Join("variant").String(), validExportExtensions)
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -136,7 +125,7 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 		command.Run(ctx)
 	}
 
-	err = utils.CopyDir(ctx.SketchBuildPath.String(), cmakeFolder.Join("sketch").String(), extensions)
+	err = utils.CopyDir(ctx.SketchBuildPath.String(), cmakeFolder.Join("sketch").String(), validExportExtensions)
 	if err != nil {
 		fmt.Println(err)
 	}

legacy/builder/utils/utils.go

@@ -243,8 +243,6 @@ func AbsolutizePaths(files []string) ([]string, error) {
 	return files, nil
 }
 
-type CheckExtensionFunc func(ext string) bool
-
 func FindFilesInFolder(dir *paths.Path, recurse bool, extensions []string) (paths.PathList, error) {
 	fileFilter := paths.AndFilter(
 		paths.FilterSuffixes(extensions...),
@@ -410,7 +408,17 @@ func CopyFile(src, dst string) (err error) {
 // CopyDir recursively copies a directory tree, attempting to preserve permissions.
 // Source directory must exist, destination directory must *not* exist.
 // Symlinks are ignored and skipped.
-func CopyDir(src string, dst string, extensions CheckExtensionFunc) (err error) {
+func CopyDir(src string, dst string, extensions []string) (err error) {
+	isAcceptedExtension := func(ext string) bool {
+		ext = strings.ToLower(ext)
+		for _, valid := range extensions {
+			if ext == valid {
+				return true
+			}
+		}
+		return false
+	}
+
 	src = filepath.Clean(src)
 	dst = filepath.Clean(dst)
 
@@ -455,7 +463,7 @@ func CopyDir(src string, dst string, extensions CheckExtensionFunc) (err error)
 				continue
 			}
 
-			if extensions != nil && !extensions(strings.ToLower(filepath.Ext(srcPath))) {
+			if !isAcceptedExtension(filepath.Ext(srcPath)) {
 				continue
 			}