Round of go fmt

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

fmt_fix_vet

@@ -1,8 +1,5 @@
 #!/bin/bash -x
 
-go fmt ./src/arduino.cc/builder/...
-go fmt ./src/arduino.cc/arduino-builder/...
-go fix ./src/arduino.cc/builder/...
-go fix ./src/arduino.cc/arduino-builder/...
-go vet ./src/arduino.cc/builder/...
-go vet ./src/arduino.cc/arduino-builder/...
+go fmt ./src/arduino.cc/...
+go fix ./src/arduino.cc/...
+go vet ./src/arduino.cc/...

src/arduino.cc/builder/container_find_includes.go

@@ -139,10 +139,10 @@ func (s *ContainerFindIncludes) Run(ctx *types.Context) error {
 	ctx.CollectedSourceFiles.Push(mergedfile)
 
 	sourceFilePaths := ctx.CollectedSourceFiles
-	queueSourceFilesFromFolder(ctx, sourceFilePaths, sketch, ctx.SketchBuildPath, /* recurse */ false)
+	queueSourceFilesFromFolder(ctx, sourceFilePaths, sketch, ctx.SketchBuildPath, false /* recurse */)
 	srcSubfolderPath := filepath.Join(ctx.SketchBuildPath, constants.SKETCH_FOLDER_SRC)
 	if info, err := os.Stat(srcSubfolderPath); err == nil && info.IsDir() {
-		queueSourceFilesFromFolder(ctx, sourceFilePaths, sketch, srcSubfolderPath, /* recurse */ true)
+		queueSourceFilesFromFolder(ctx, sourceFilePaths, sketch, srcSubfolderPath, true /* recurse */)
 	}
 
 	for !sourceFilePaths.Empty() {
@@ -195,7 +195,7 @@ type includeCacheEntry struct {
 
 type includeCache struct {
 	// Are the cache contents valid so far?
-	valid   bool
+	valid bool
 	// Index into entries of the next entry to be processed. Unused
 	// when the cache is invalid.
 	next    int
@@ -373,7 +373,7 @@ func queueSourceFilesFromFolder(ctx *types.Context, queue *types.UniqueSourceFil
 
 	for _, filePath := range filePaths {
 		sourceFile, err := types.MakeSourceFile(ctx, origin, filePath)
-		if (err != nil) {
+		if err != nil {
 			return i18n.WrapError(err)
 		}
 		queue.Push(sourceFile)

src/arduino.cc/builder/gcc_preproc_runner.go

@@ -44,7 +44,7 @@ import (
 type GCCPreprocRunner struct {
 	SourceFilePath string
 	TargetFileName string
-	Includes []string
+	Includes       []string
 }
 
 func (s *GCCPreprocRunner) Run(ctx *types.Context) error {
@@ -73,7 +73,7 @@ func (s *GCCPreprocRunner) Run(ctx *types.Context) error {
 type GCCPreprocRunnerForDiscoveringIncludes struct {
 	SourceFilePath string
 	TargetFilePath string
-	Includes []string
+	Includes       []string
 }
 
 func (s *GCCPreprocRunnerForDiscoveringIncludes) Run(ctx *types.Context) error {

src/arduino.cc/builder/test/includes_to_include_folders_test.go

@@ -32,12 +32,12 @@ package test
 import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/types"
+	"fmt"
 	"github.com/stretchr/testify/require"
 	"os"
 	"path/filepath"
 	"sort"
 	"testing"
-	"fmt"
 )
 
 func TestIncludesToIncludeFolders(t *testing.T) {
@@ -339,4 +339,3 @@ func TestIncludesToIncludeFoldersSubfolders(t *testing.T) {
 	require.Equal(t, "testlib2", importedLibraries[1].Name)
 	require.Equal(t, "testlib3", importedLibraries[2].Name)
 }
-

src/arduino.cc/builder/types/context.go

@@ -46,7 +46,7 @@ type Context struct {
 	PreprocPath          string
 	SketchObjectFiles    []string
 
-	CollectedSourceFiles   *UniqueSourceFileQueue
+	CollectedSourceFiles *UniqueSourceFileQueue
 
 	Sketch          *Sketch
 	Source          string

src/arduino.cc/builder/types/types.go

@@ -40,9 +40,9 @@ import (
 
 type SourceFile struct {
 	// Sketch or Library pointer that this source file lives in
-        Origin interface{}
+	Origin interface{}
 	// Path to the source file within the sketch/library root folder
-        RelativePath string
+	RelativePath string
 }
 
 // Create a SourceFile containing the given source file path within the
@@ -63,40 +63,40 @@ func MakeSourceFile(ctx *Context, origin interface{}, path string) (SourceFile,
 // be placed. Any directories inside SourceFile.RelativePath will be
 // appended here.
 func buildRoot(ctx *Context, origin interface{}) string {
-        switch o := origin.(type) {
-                case *Sketch:
-                        return ctx.SketchBuildPath
-                case *Library:
-			return filepath.Join(ctx.LibrariesBuildPath, o.Name)
-                default:
-                        panic("Unexpected origin for SourceFile: " + fmt.Sprint(origin))
-        }
+	switch o := origin.(type) {
+	case *Sketch:
+		return ctx.SketchBuildPath
+	case *Library:
+		return filepath.Join(ctx.LibrariesBuildPath, o.Name)
+	default:
+		panic("Unexpected origin for SourceFile: " + fmt.Sprint(origin))
+	}
 }
 
 // Return the source root for the given origin, where its source files
 // can be found. Prepending this to SourceFile.RelativePath will give
 // the full path to that source file.
 func sourceRoot(ctx *Context, origin interface{}) string {
-        switch o := origin.(type) {
-                case *Sketch:
-                        return ctx.SketchBuildPath
-                case *Library:
-			return o.SrcFolder
-                default:
-                        panic("Unexpected origin for SourceFile: " + fmt.Sprint(origin))
-        }
+	switch o := origin.(type) {
+	case *Sketch:
+		return ctx.SketchBuildPath
+	case *Library:
+		return o.SrcFolder
+	default:
+		panic("Unexpected origin for SourceFile: " + fmt.Sprint(origin))
+	}
 }
 
 func (f *SourceFile) SourcePath(ctx *Context) string {
-        return filepath.Join(sourceRoot(ctx, f.Origin), f.RelativePath)
+	return filepath.Join(sourceRoot(ctx, f.Origin), f.RelativePath)
 }
 
 func (f *SourceFile) ObjectPath(ctx *Context) string {
-        return filepath.Join(buildRoot(ctx, f.Origin), f.RelativePath + ".o")
+	return filepath.Join(buildRoot(ctx, f.Origin), f.RelativePath+".o")
 }
 
 func (f *SourceFile) DepfilePath(ctx *Context) string {
-        return filepath.Join(buildRoot(ctx, f.Origin), f.RelativePath + ".d")
+	return filepath.Join(buildRoot(ctx, f.Origin), f.RelativePath+".d")
 }
 
 type SketchFile struct {
@@ -163,23 +163,23 @@ const (
 )
 
 type Library struct {
-	Folder      string
-	SrcFolder   string
+	Folder        string
+	SrcFolder     string
 	UtilityFolder string
-	Layout      LibraryLayout
-	Name        string
-	Archs       []string
-	DotALinkage bool
-	IsLegacy    bool
-	Version     string
-	Author      string
-	Maintainer  string
-	Sentence    string
-	Paragraph   string
-	URL         string
-	Category    string
-	License     string
-	Properties  map[string]string
+	Layout        LibraryLayout
+	Name          string
+	Archs         []string
+	DotALinkage   bool
+	IsLegacy      bool
+	Version       string
+	Author        string
+	Maintainer    string
+	Sentence      string
+	Paragraph     string
+	URL           string
+	Category      string
+	License       string
+	Properties    map[string]string
 }
 
 func (library *Library) String() string {

src/arduino.cc/builder/utils/utils.go

@@ -30,10 +30,6 @@
 package utils
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/gohasissues"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
 	"crypto/md5"
 	"encoding/hex"
 	"io/ioutil"
@@ -42,6 +38,11 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"arduino.cc/builder/constants"
+	"arduino.cc/builder/gohasissues"
+	"arduino.cc/builder/i18n"
+	"arduino.cc/builder/types"
 )
 
 func KeysOfMapOfStringInterface(input map[string]interface{}) []string {